Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Fri, 17 Dec 2010 23:29:50 +0000 (15:29 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Fri, 17 Dec 2010 23:29:50 +0000 (15:29 -0800)

Trivial merge