Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Thu, 3 Feb 2011 21:29:42 +0000 (13:29 -0800)
committerErik Gilling <konkers@android.com>
Thu, 3 Feb 2011 21:29:49 +0000 (13:29 -0800)
Change-Id: I65d011f4a13d99ffc617a807d551d5869b739662


Trivial merge