Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Mon, 21 Mar 2011 21:14:12 +0000 (14:14 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Mon, 21 Mar 2011 21:14:12 +0000 (14:14 -0700)

Trivial merge