Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Wed, 11 May 2011 02:20:23 +0000 (19:20 -0700)
committerColin Cross <ccross@android.com>
Wed, 11 May 2011 02:20:23 +0000 (19:20 -0700)

Trivial merge