Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Sat, 12 Feb 2011 22:13:29 +0000 (14:13 -0800)
committerColin Cross <ccross@android.com>
Sat, 12 Feb 2011 22:13:29 +0000 (14:13 -0800)

Trivial merge