Merge branch 'linux-tegra' into android-tegra
authorErik Gilling <konkers@android.com>
Tue, 15 Feb 2011 02:07:02 +0000 (18:07 -0800)
committerErik Gilling <konkers@android.com>
Tue, 15 Feb 2011 02:07:02 +0000 (18:07 -0800)

Trivial merge