Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 27 Oct 2010 04:08:37 +0000 (21:08 -0700)
committerErik Gilling <konkers@android.com>
Wed, 27 Oct 2010 04:08:42 +0000 (21:08 -0700)
Change-Id: Ifde4541e78b49ef83ed11d3a488c6580cf89af15


Trivial merge