Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Fri, 19 Nov 2010 00:36:48 +0000 (16:36 -0800)
committerErik Gilling <konkers@android.com>
Fri, 19 Nov 2010 00:36:54 +0000 (16:36 -0800)
Change-Id: Iff6fb3eee3b96120f3973ccada4c0b0772dbc2b3


Trivial merge