Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Wed, 17 Nov 2010 22:18:29 +0000 (14:18 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Wed, 17 Nov 2010 22:18:29 +0000 (14:18 -0800)

Trivial merge