Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Thu, 4 Nov 2010 00:05:47 +0000 (17:05 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Thu, 4 Nov 2010 00:05:47 +0000 (17:05 -0700)

Trivial merge