Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Fri, 21 Jan 2011 08:33:14 +0000 (00:33 -0800)
committerColin Cross <ccross@android.com>
Fri, 21 Jan 2011 08:33:14 +0000 (00:33 -0800)

Trivial merge