Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Fri, 15 Oct 2010 19:04:05 +0000 (12:04 -0700)
committerColin Cross <ccross@android.com>
Fri, 15 Oct 2010 19:04:05 +0000 (12:04 -0700)
commit9ab3d8b9fcc83cb2eab5cc9834b742d437915a2e
tree0a4dc68f031cba95cd36ededfb9b30de60fe1145
parentc8b43bb8ec47fc7e75f4474b454d459a22d9f233
parent89c37cce1c850fe046df50ccb923a8eccbf259b6
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
drivers/net/Kconfig
fs/fs-writeback.c
fs/proc/base.c
kernel/sysctl.c
mm/page_alloc.c
net/bluetooth/l2cap.c