Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 19 Oct 2010 19:48:52 +0000 (12:48 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 19 Oct 2010 19:48:52 +0000 (12:48 -0700)

Trivial merge