tree 8b8a51236ba331146e3930db5cb0b387fde7514d
parent eac84739721857f4d5be3d9127f4644f16a9bea4
parent 0a4e1c9069b3cc2a9e5b57898ac9be94314e8efa
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1236699723 +0000
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1236699723 +0000

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