Merge branch 'nv-3.1-grouper-test' into android-tegra3-grouper-3.1-lollipop-release

Conflicts:
	arch/arm/configs/tegra3_android_defconfig
Merge branch 'android-tegra3-grouper-3.1-lollipop-release' of https://github.com/n1kolaa/nv-3.1-grouper into android-tegra3-grouper-3.1-lollipop-release

Conflicts:
	arch/arm/configs/tegra3_android_defconfig