Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Thu, 18 Nov 2010 23:49:06 +0000 (15:49 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Thu, 18 Nov 2010 23:49:06 +0000 (15:49 -0800)

Trivial merge