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

Trivial merge