Merge commit 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Fri, 8 Oct 2010 23:04:11 +0000 (16:04 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Fri, 8 Oct 2010 23:04:11 +0000 (16:04 -0700)

Trivial merge