]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 4 Dec 2009 15:22:41 +0000 (16:22 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 4 Dec 2009 15:22:41 +0000 (16:22 +0100)
1  2 
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-zoom2.c
sound/soc/codecs/tlv320aic23.c
sound/soc/codecs/wm9713.c

Simple merge
Simple merge
Simple merge