Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Mon, 24 Jan 2011 20:50:57 +0000 (12:50 -0800)
committerErik Gilling <konkers@android.com>
Mon, 24 Jan 2011 20:51:05 +0000 (12:51 -0800)
Change-Id: I31c6619f888c36cfe571fda8593f6e1172810ba9


Trivial merge