Merge commit '5275e74' into after-upstream-android
authorDan Willemsen <dwillemsen@nvidia.com>
Sat, 24 Mar 2012 04:43:21 +0000 (21:43 -0700)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 24 Mar 2012 04:43:21 +0000 (21:43 -0700)
commit9c6641224bdc2957f1d4ef692f027ff5e0fcc63b
tree589c55d8a24b79a5cfd2cb3379d1ce0cac9c7464
parentc9134a33b3936ca9cae8bdc6dccd77e9c294f0ef
parent5275e74ae5e7e92b05bd1361e2573bb38d381358
Merge commit '5275e74' into after-upstream-android

Conflicts:
arch/arm/common/Kconfig
arch/arm/mm/Makefile
arch/arm/mm/cache-l2x0.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/core/core.c

Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
39 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/smp.c
arch/arm/mm/Makefile
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
arch/arm/vfp/vfpmodule.c
block/genhd.c
block/partition-generic.c
drivers/cpufreq/cpufreq_stats.c
drivers/hid/hid-input.c
drivers/input/evdev.c
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/card/block.c
drivers/mmc/core/bus.c
drivers/mmc/core/core.c
drivers/mmc/core/host.c
drivers/mmc/core/sd.c
drivers/mmc/core/sdio.c
drivers/mmc/host/sdhci.c
drivers/net/tun.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/Makefile
drivers/usb/otg/Kconfig
drivers/usb/otg/Makefile
drivers/video/Kconfig
include/linux/mmc/host.h
include/linux/sched.h
include/net/tcp.h
kernel/fork.c
kernel/printk.c
kernel/sched/core.c