Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 21 Oct 2010 21:52:03 +0000 (14:52 -0700)
committerColin Cross <ccross@android.com>
Thu, 21 Oct 2010 21:52:03 +0000 (14:52 -0700)
1  2 
drivers/input/evdev.c
drivers/mmc/core/core.c

Simple merge
Simple merge