Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Fri, 5 Nov 2010 01:17:50 +0000 (18:17 -0700)
committerColin Cross <ccross@android.com>
Fri, 5 Nov 2010 01:17:50 +0000 (18:17 -0700)

Trivial merge