tree 6307eb9d16ccbe6c731a9b6650196695e3241b0c
parent ccb077fd466ec3f35662d6c66412b42b36e11bc3
parent a1992db55d80297544a65160ddb98afba45f7759
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1240479227 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1240479227 +0100

Merge commit 'takashi/fix/asoc' into for-2.6.30