Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Tue, 19 Apr 2011 20:36:37 +0000 (13:36 -0700)
committerErik Gilling <konkers@android.com>
Tue, 19 Apr 2011 20:36:39 +0000 (13:36 -0700)
Change-Id: I023482f230dc4f413647f47b3c7c36fd4c98b97d


Trivial merge