Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Fri, 22 Apr 2011 00:36:15 +0000 (17:36 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Fri, 22 Apr 2011 00:36:15 +0000 (17:36 -0700)

Trivial merge