Merge remote-tracking branch 'linux/linux-3.4.y' into sm-jb-mr1

Conflicts:
	Makefile

Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>