Merge branch 'pxa-ssp' into for-2.6.30
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 17 Mar 2009 19:07:26 +0000 (19:07 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 17 Mar 2009 19:07:26 +0000 (19:07 +0000)

Trivial merge