Merge branch 'gta02-audio' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 30 Jul 2009 12:21:38 +0000 (13:21 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 30 Jul 2009 12:21:38 +0000 (13:21 +0100)

Trivial merge