Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorDima Zavin <dima@android.com>
Mon, 8 Nov 2010 07:55:59 +0000 (23:55 -0800)
committerDima Zavin <dima@android.com>
Mon, 8 Nov 2010 07:55:59 +0000 (23:55 -0800)

Trivial merge