]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'topic/core-cleanup' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 13 Apr 2010 10:57:59 +0000 (12:57 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 13 Apr 2010 10:57:59 +0000 (12:57 +0200)
commite04201e9b28b1214bc19bdf7077af2206c4d29a9
treee9641d5c4b9978a662668ff58be1e07dc5c20a9a
parent4a0ac415ec88e33d059b7a85236447e3095b78f2
parentc56a3b18475b0f93b484c25162c1379f5aee367a
Merge branch 'topic/core-cleanup' into for-next

Conflicts:
sound/soc/codecs/ad1938.c
23 files changed:
arch/arm/mach-davinci/board-dm365-evm.c
arch/arm/plat-omap/mcbsp.c
drivers/gpio/wm8994-gpio.c
drivers/mfd/wm8994-core.c
sound/core/jack.c
sound/core/pcm_native.c
sound/soc/codecs/ak4642.c
sound/soc/codecs/da7210.c
sound/soc/codecs/ssm2602.c
sound/soc/codecs/tlv320dac33.c
sound/soc/codecs/twl4030.c
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8731.c
sound/soc/codecs/wm8750.c
sound/soc/codecs/wm8903.c
sound/soc/codecs/wm8904.c
sound/soc/codecs/wm8960.c
sound/soc/codecs/wm8994.c
sound/soc/omap/mcpdm.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c
sound/soc/soc-dapm.c
sound/usb/usx2y/us122l.c