Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Sat, 8 Jan 2011 22:48:26 +0000 (14:48 -0800)
committerColin Cross <ccross@android.com>
Sat, 8 Jan 2011 22:48:26 +0000 (14:48 -0800)
commit334bd209f1f264742e4abfba8b0f2dc54d1d053a
tree2fdbe508c1d4dda3beba854591c7e53e58939426
parentec28871223b53b80038679e82e2fd19b85665d0e
parentc07aee9df0e40fe9621db66ec00857228090e46c
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile

Change-Id: Ic136562830dcd821eaae66f4c1fc66b4e0b825bd