Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 13 Dec 2013 18:52:59 +0000 (18:52 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 13 Dec 2013 18:52:59 +0000 (18:52 +0000)
commit358194677ff980dd058b521295f3f76c20cfdfc8
tree40ddafbf592743e04a01717f3ba5e52953630ab5
parent5a4b318f126a97d1ec0ef12ce5833576698e88de
parent679160a872dfe88bf34e50f1939e190ba59e534e
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
arch/arm/boot/Makefile
drivers/video/Kconfig
mm/mempolicy.c