]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Jan 2011 15:19:29 +0000 (15:19 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Jan 2011 15:19:29 +0000 (15:19 +0000)
1  2 
sound/soc/samsung/neo1973_gta02_wm8753.c
sound/soc/samsung/s3c24xx_simtec_hermes.c
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
sound/soc/samsung/s3c24xx_uda134x.c

Simple merge