]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'dapm' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Jun 2009 20:04:04 +0000 (21:04 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Jun 2009 20:04:04 +0000 (21:04 +0100)
1  2 
include/sound/soc.h
sound/soc/soc-dapm.c

Simple merge
Simple merge