]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Nov 2010 11:57:43 +0000 (11:57 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Nov 2010 11:57:43 +0000 (11:57 +0000)
1  2 
sound/soc/codecs/wm8961.c
sound/soc/omap/omap3pandora.c

Simple merge
Simple merge