tree fd27b986295fe5a4f1c0924a804228f829a4c894
parent 376f7839b72ec526173cafb5d8eadfc61e2effdf
parent 8560b9321f9050968f393ce1ec67e47c1a0bd5cf
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1241514775 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1241514775 +0100

Merge commit 'takashi/topic/asoc' into for-2.6.31