]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge branch 'for-2.6.36' into for-2.6.37
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 27 Aug 2010 19:10:22 +0000 (20:10 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 27 Aug 2010 19:10:22 +0000 (20:10 +0100)
1  2 
sound/soc/soc-core.c

Simple merge