Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Mon, 24 Jan 2011 23:48:38 +0000 (15:48 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Mon, 24 Jan 2011 23:48:43 +0000 (15:48 -0800)
Change-Id: Ifc4b876bb673b2f3beaa3c5995bc3d527f6f717d


Trivial merge