Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Fri, 17 Dec 2010 07:10:41 +0000 (23:10 -0800)
committerColin Cross <ccross@android.com>
Fri, 17 Dec 2010 07:10:41 +0000 (23:10 -0800)

Trivial merge