Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Wed, 12 Jan 2011 19:38:21 +0000 (11:38 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Wed, 12 Jan 2011 19:38:21 +0000 (11:38 -0800)

Trivial merge