Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Fri, 1 Apr 2011 00:42:16 +0000 (17:42 -0700)
committerColin Cross <ccross@android.com>
Fri, 1 Apr 2011 00:42:16 +0000 (17:42 -0700)

Trivial merge