Merge branches 'for-2.6.38' and 'tegra-arch' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 1 Feb 2011 14:21:09 +0000 (14:21 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 1 Feb 2011 14:21:09 +0000 (14:21 +0000)

Trivial merge