Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Wed, 26 Jan 2011 04:34:59 +0000 (20:34 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Wed, 26 Jan 2011 04:34:59 +0000 (20:34 -0800)

Trivial merge