Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Thu, 13 Jan 2011 01:47:11 +0000 (17:47 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Thu, 13 Jan 2011 01:47:11 +0000 (17:47 -0800)

Trivial merge