Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Thu, 7 Apr 2011 23:54:01 +0000 (16:54 -0700)
committerErik Gilling <konkers@android.com>
Thu, 7 Apr 2011 23:54:31 +0000 (16:54 -0700)
Change-Id: I0dea4f256442d7391808de8456fe35d3879682fe


Trivial merge