Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 5 Jan 2011 01:51:22 +0000 (17:51 -0800)
committerErik Gilling <konkers@android.com>
Wed, 5 Jan 2011 01:51:27 +0000 (17:51 -0800)
Change-Id: Iec42f1fa234c03c6267f91ba0553d1c651b9ba94


Trivial merge