tree 4cc46339721366c7498dacf5ebac01906be273e7
parent 6f341d14811550d863ba804ce6ec7757a7145081
parent 5dcba5d6741d4533e0ef696507f93f2a4c738efb
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1281620428 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1281620428 +0100

Merge branch 'topic/multi-component' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into for-2.6.37