ter Mark Brown <broonie@opensource.wolfsonmicro.com> 1304446065 +0100

Merge branch 'for-2.6.39' into for-2.6.40
NÄe