]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 01:07:15 +0000 (12:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 01:07:15 +0000 (12:07 +1100)
commit2aa7178501000e950d8367fe53c57d2356d9f6b6
tree1d63fcc34a856301413a35fb01117c76ae156ce6
parent6343455923cca14dae6c0bba4c4ca35474389f59
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