Merge branch 'android-tegra-flounder-3.10-marshmallow-mr1' of https://android.googlesource.com/kernel/tegra into android-6.0

Conflicts:
	arch/arm64/configs/flounder_defconfig
	build.config
	drivers/android/binder.c
	drivers/misc/uid_cputime.c