]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 11 Apr 2011 20:29:24 +0000 (13:29 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 11 Apr 2011 20:29:24 +0000 (13:29 -0700)
1  2 
sound/soc/codecs/sn95031.c
sound/soc/mid-x86/sst_platform.c

Simple merge
Simple merge