e0db613a31
parent c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470
parent c88c2823e87dd6f8214b8b8cdc36d45f205a8077
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1295435832 +0000
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1295435832 +0000

Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.38
6