Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Mon, 10 Jan 2011 03:20:14 +0000 (19:20 -0800)
committerColin Cross <ccross@android.com>
Mon, 10 Jan 2011 03:20:14 +0000 (19:20 -0800)

Trivial merge