]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 12 Dec 2011 04:59:06 +0000 (12:59 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 12 Dec 2011 04:59:06 +0000 (12:59 +0800)
1  2 
sound/soc/codecs/wm8958-dsp2.c
sound/soc/pxa/hx4700.c

Simple merge
Simple merge