]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 03:48:07 +0000 (14:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 03:48:07 +0000 (14:48 +1100)
commita7d3fddbfde0d8e01d75811874e4724ec035086e
treeaced37ff15ffdeb42f000e67ca0761511ebfa8c0
parentb6b5c338f2e542aaa503077b900cbbf034fda61b
parent96ef593005bc428551a2b345e6a78c91b53117ed
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