Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Fri, 29 Oct 2010 00:53:30 +0000 (17:53 -0700)
committerColin Cross <ccross@android.com>
Fri, 29 Oct 2010 00:53:30 +0000 (17:53 -0700)

Trivial merge