Merge commit 'a88f9e27498afaea615ad3e93af4f26df1f84987' into after-upstream-android
authorDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 08:36:41 +0000 (01:36 -0700)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 08:36:41 +0000 (01:36 -0700)
commitc70ba0b1799cd1c3a2f027238851149ecdb79da6
tree693cbeda7444a624731b8b2c0616365ed5ab7335
parentfa791cecfb6dcf223d81c2e0aac2cd1f93d7c911
parenta88f9e27498afaea615ad3e93af4f26df1f84987
Merge commit 'a88f9e27498afaea615ad3e93af4f26df1f84987' into after-upstream-android

Conflicts:
arch/arm/common/Kconfig
arch/arm/mm/Makefile
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
drivers/input/Kconfig
drivers/input/Makefile
drivers/power/Kconfig
kernel/futex.c
53 files changed:
arch/arm/Kconfig
arch/arm/common/Kconfig
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/kernel/process.c
arch/arm/kernel/smp.c
arch/arm/mm/cache-l2x0.c
arch/arm/mm/fault.c
arch/arm/mm/mmu.c
block/genhd.c
drivers/cpufreq/Makefile
drivers/cpufreq/cpufreq_stats.c
drivers/cpuidle/governors/menu.c
drivers/input/Kconfig
drivers/input/Makefile
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
drivers/mmc/core/sdio.c
drivers/mmc/core/sdio_io.c
drivers/mtd/nand/Kconfig
drivers/net/tun.c
drivers/net/wireless/Kconfig
drivers/power/Kconfig
drivers/power/Makefile
drivers/tty/serial/serial_core.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/Makefile
drivers/usb/gadget/f_rndis.c
drivers/usb/gadget/udc-core.c
drivers/usb/phy/Kconfig
drivers/usb/phy/Makefile
drivers/video/Kconfig
include/linux/cgroup.h
include/linux/cpufreq.h
include/linux/mmc/host.h
include/net/bluetooth/hci_core.h
include/trace/events/power.h
include/uapi/linux/if_pppox.h
kernel/cgroup.c
kernel/cpu.c
kernel/fork.c
kernel/printk.c
kernel/trace/Kconfig
kernel/trace/Makefile
kernel/trace/trace.c
kernel/trace/trace.h
lib/Kconfig.debug
mm/page_alloc.c