]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 02:13:12 +0000 (13:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 02:13:12 +0000 (13:13 +1100)
commit1ea7b74c7b5a06254fd0e35eabc496d188a31b9f
tree671572ab79e92a6290093ae36b3c968e427ed7ad
parent3146ccab1b656d0f32aefc5332cc2616c4e4ce02
parentba82b40621eaa587e3fc39b300050cf5ba8399e8
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-shmobile/board-ap4evb.c
sound/soc/au1x/db1200.c
sound/soc/ep93xx/ep93xx-pcm.c
sound/soc/imx/imx-pcm-dma-mx2.c
sound/soc/mxs/mxs-saif.c
sound/soc/nuc900/nuc900-ac97.c
sound/soc/samsung/dma.c
sound/soc/txx9/txx9aclc.c