Merge branch 'cm-10.1' into HEAD

Conflicts:
	arch/arm/mach-tegra/board-olympus-modem.c

Change-Id: I9342ae94378a35e8890d078680307b09788ad5bb