Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Fri, 17 Dec 2010 07:09:45 +0000 (23:09 -0800)
committerColin Cross <ccross@android.com>
Fri, 17 Dec 2010 07:09:45 +0000 (23:09 -0800)

Trivial merge