Squashed update of kernel from 3.4.90 to 3.4.91

Signed-off-by: Javelin <javelinanddart@gmail.com>

Conflicts:
	include/linux/net.h