Merge commit 'v2.6.36' into linux-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 21 Oct 2010 21:48:14 +0000 (14:48 -0700)
committerColin Cross <ccross@android.com>
Thu, 21 Oct 2010 21:48:14 +0000 (14:48 -0700)

Trivial merge