Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 7 Dec 2010 03:35:21 +0000 (19:35 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 7 Dec 2010 03:35:21 +0000 (19:35 -0800)

Trivial merge