Merge branch 'tegra-arch' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Jan 2011 20:27:56 +0000 (20:27 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Jan 2011 20:27:56 +0000 (20:27 +0000)

Trivial merge