Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Sat, 8 Jan 2011 01:20:53 +0000 (17:20 -0800)
committerColin Cross <ccross@android.com>
Sat, 8 Jan 2011 01:20:53 +0000 (17:20 -0800)
commit351516118103c6c7bb5321aa9d5866eb3dc0d5ca
treebf8ecc55d77847ec8299bcf964352bef38121cc5
parentc37bff78783d40d6e604129135c207e279de902f
parentbd842b53fada517017d192c8a12fc9a38e6250e1
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

Conflicts:
arch/arm/mm/cache-v6.S

Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491
arch/arm/mm/cache-v6.S
drivers/mmc/core/core.c
drivers/usb/gadget/composite.c
include/linux/sched.h
kernel/fork.c
kernel/printk.c
kernel/sched.c
net/ipv4/tcp.c
net/ipv4/tcp_ipv4.c