]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 02:26:58 +0000 (13:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 02:26:58 +0000 (13:26 +1100)
commit63f164795c4f7c089b8042e05867bd7fc0f9951f
treedecf781867dab904d2e8a0b1a83da252b91fce83
parent73cb86f2e5d9f3cd0586d1a9d25b78cbce81bbed
parent14f45e1ff65c2b109f36261eb1a720adc1d18c50
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