Merge branch 'pxa2xx-i2s' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 14 May 2009 19:35:51 +0000 (20:35 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 14 May 2009 19:35:51 +0000 (20:35 +0100)

Trivial merge