Merge remote-tracking branch 'origin/upstream/android-common-3.10' into linux-linaro...
author黄涛 <huangtao@rock-chips.com>
Mon, 11 Nov 2013 06:08:00 +0000 (14:08 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 11 Nov 2013 06:08:00 +0000 (14:08 +0800)
commite918de9e9f68a742cef3d3741e61d6f5eb3e9717
treecba69f6f7bc1a17d8a7a839fc706357759158313
parent47cf66ff098ac408194713be6531a7bb57d1b99b
parent4244575c2f5d35c56b88d3d5bd34558c111e8667
Merge remote-tracking branch 'origin/upstream/android-common-3.10' into linux-linaro-lsk-v3.10-android+android-common-3.10

Conflicts:
drivers/cpufreq/cpufreq_interactive.c
arch/arm/boot/Makefile
drivers/cpufreq/cpufreq_interactive.c
drivers/staging/android/ion/ion_chunk_heap.c
drivers/video/Kconfig
drivers/video/Makefile
fs/proc/task_mmu.c
include/linux/mm_types.h
mm/mempolicy.c
mm/mmap.c
mm/page_alloc.c