tree 1ec0fc6ecf51c7baf7bf6cfbd9250c3fee16a09b
parent d2314e0e27566f8830ebed3587cc049e07e6a4ee
parent 85fab7802a4bc00cc752f430e22a0d9fc41fe199
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1237316846 +0000
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1237316846 +0000

Merge branch 'pxa-ssp' into for-2.6.30