Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Wed, 22 Dec 2010 02:38:13 +0000 (18:38 -0800)
committerColin Cross <ccross@android.com>
Wed, 22 Dec 2010 02:38:13 +0000 (18:38 -0800)
commit3f29a8834975956ed5590959bfced00cb9bd03ed
tree03489c32e70a21b586678d217467dce2f1b44cdc
parent4ad2ce14311f7ee8474ee48b8fb0fad72648e5eb
parentb104a07edb2a319f734ddc4fe04852865d8d9e24
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

Conflicts:
drivers/usb/gadget/composite.c

Change-Id: I1a332ec21da62aea98912df9a01cf0282ed50ee1
arch/arm/mm/fault-armv.c
block/genhd.c
drivers/mmc/core/core.c
drivers/usb/gadget/composite.c
fs/ext4/super.c
fs/proc/base.c
kernel/power/suspend.c
kernel/sched.c
mm/page_alloc.c
net/bluetooth/l2cap.c
net/socket.c