Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 16 Nov 2010 22:32:19 +0000 (14:32 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 16 Nov 2010 22:32:22 +0000 (14:32 -0800)
Change-Id: Ia027b838f8971f49b3f8cd276e2bc74f050210a7


Trivial merge