Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 27 Oct 2010 01:22:24 +0000 (18:22 -0700)
committerErik Gilling <konkers@android.com>
Wed, 27 Oct 2010 01:22:28 +0000 (18:22 -0700)
Change-Id: I0d4216b0a407e50c029a6c0869d727b188f7da04


Trivial merge