Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorIliyan Malchev <malchev@google.com>
Fri, 5 Nov 2010 21:02:38 +0000 (14:02 -0700)
committerIliyan Malchev <malchev@google.com>
Fri, 5 Nov 2010 21:02:38 +0000 (14:02 -0700)

Trivial merge