Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Fri, 12 Nov 2010 02:12:08 +0000 (18:12 -0800)
committerErik Gilling <konkers@android.com>
Fri, 12 Nov 2010 02:12:29 +0000 (18:12 -0800)
Change-Id: I15e4d0a951e48c27e8f155e94c19f8fbe37131a0


Trivial merge