]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 20 Aug 2010 16:19:27 +0000 (17:19 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 20 Aug 2010 16:19:27 +0000 (17:19 +0100)
1  2 
sound/soc/fsl/fsl_dma.c

Simple merge