Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Fri, 4 Mar 2011 02:55:38 +0000 (18:55 -0800)
committerColin Cross <ccross@android.com>
Fri, 4 Mar 2011 02:55:38 +0000 (18:55 -0800)

Trivial merge