Merge commit 'v3.3-rc4' into android-3.3
authorColin Cross <ccross@android.com>
Tue, 21 Feb 2012 20:45:05 +0000 (12:45 -0800)
committerColin Cross <ccross@android.com>
Tue, 21 Feb 2012 20:45:05 +0000 (12:45 -0800)
commitfbd94b86e411e6ea0b4fa56682120b32af5c16c2
tree59f59602de610bddfad66e294cb42ee1d1f29d31
parent293f64abe6006f6ff1cc6f672e27729ff7b74ead
parentb01543dfe67bb1d191998e90d20534dc354de059
Merge commit 'v3.3-rc4' into android-3.3

Conflicts:
drivers/mmc/core/sdio.c
drivers/staging/android/Kconfig
drivers/staging/android/lowmemorykiller.c

Change-Id: I39ef9b27bb9febaee811b200ccac0ed5d51147f3
16 files changed:
arch/arm/kernel/traps.c
arch/x86/kernel/process_64.c
drivers/misc/Kconfig
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
drivers/mmc/core/sdio.c
drivers/staging/android/Kconfig
drivers/staging/android/Makefile
drivers/staging/android/binder.c
drivers/usb/otg/Kconfig
fs/fs-writeback.c
include/linux/mmc/host.h
include/net/tcp.h
kernel/fork.c
net/ipv4/tcp.c