Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Fri, 29 Oct 2010 01:07:30 +0000 (18:07 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Fri, 29 Oct 2010 01:07:35 +0000 (18:07 -0700)
Change-Id: I9bdd8188cbbdf3cc9860b54500f080662d90a20a


Trivial merge