Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Tue, 22 Mar 2011 18:42:14 +0000 (11:42 -0700)
committerColin Cross <ccross@android.com>
Tue, 22 Mar 2011 18:42:14 +0000 (11:42 -0700)

Trivial merge