Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2

Conflicts:
	drivers/video/tegra/ssd2825/ssd2825_bridge.c

Conflicts:
	drivers/video/tegra/ssd2825/ssd2825_bridge.c