Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorIliyan Malchev <malchev@google.com>
Tue, 23 Nov 2010 22:24:25 +0000 (14:24 -0800)
committerIliyan Malchev <malchev@google.com>
Tue, 23 Nov 2010 22:24:25 +0000 (14:24 -0800)

Trivial merge