Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

Conflicts:
	drivers/staging/android/ion/ion_chunk_heap.c
	kernel/printk.c

diff --cc arch/arm/boot/Makefile
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc mm/mempolicy.c
Simple merge