Merge branch 'linux-tegra' into android-tegra
authorErik Gilling <konkers@android.com>
Thu, 21 Oct 2010 01:27:16 +0000 (18:27 -0700)
committerErik Gilling <konkers@android.com>
Thu, 21 Oct 2010 01:27:16 +0000 (18:27 -0700)

Trivial merge