Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0
authorTodd Poynor <toddpoynor@google.com>
Thu, 1 Nov 2012 20:36:34 +0000 (13:36 -0700)
committerTodd Poynor <toddpoynor@google.com>
Thu, 1 Nov 2012 20:36:34 +0000 (13:36 -0700)
commit925d49abc38dcc7ef1cbfe125c6f0b2202ae3df3
treea56506710f0340db055191e3cf0a207699c1b849
parent834029ac9d0ad8dea4e6a21bc34877dc3740b9f4
parent27d0858dbcf199838b8c50a3e94d397bf326d986
Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0

Change-Id: I9685feb9277b450da10d78a455b3c0674d6cfe18
Signed-off-by: Todd Poynor <toddpoynor@google.com>
37 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/boot/compressed/head.S
arch/arm/kernel/smp.c
block/genhd.c
drivers/base/power/runtime.c
drivers/mmc/core/sd.c
drivers/mmc/core/sdio.c
drivers/mmc/host/sdhci.c
drivers/net/Kconfig
drivers/net/tun.c
drivers/tty/serial/serial_core.c
drivers/usb/gadget/u_ether.c
drivers/usb/host/ehci-q.c
fs/fuse/dev.c
include/linux/cpu.h
include/linux/mmc/host.h
include/linux/sched.h
kernel/cgroup.c
kernel/fork.c
kernel/futex.c
kernel/power/suspend.c
kernel/sched.c
kernel/time/timekeeping.c
mm/page_alloc.c
mm/shmem.c
net/bluetooth/hci_sock.c
net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/sock.c
net/ipv4/tcp.c
net/ipv6/addrconf.c
net/ipv6/route.c
net/wireless/core.c
net/wireless/core.h
net/wireless/reg.c
net/xfrm/xfrm_policy.c
scripts/Kbuild.include