Merge branch 'linux-tegra' into android-tegra
authorErik Gilling <konkers@android.com>
Fri, 15 Apr 2011 22:56:26 +0000 (15:56 -0700)
committerErik Gilling <konkers@android.com>
Fri, 15 Apr 2011 22:56:26 +0000 (15:56 -0700)

Trivial merge