Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Fri, 5 Nov 2010 20:22:32 +0000 (13:22 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Fri, 5 Nov 2010 20:22:32 +0000 (13:22 -0700)

Trivial merge