Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Mon, 18 Oct 2010 23:19:27 +0000 (16:19 -0700)
committerColin Cross <ccross@android.com>
Mon, 18 Oct 2010 23:20:20 +0000 (16:20 -0700)
Change-Id: I200eea8eecc5afb9eb1595f2b5357315b0b14808


Trivial merge