Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Sat, 22 Jan 2011 03:11:02 +0000 (19:11 -0800)
committerColin Cross <ccross@android.com>
Sat, 22 Jan 2011 03:11:02 +0000 (19:11 -0800)

Trivial merge