]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 02:28:04 +0000 (13:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 02:28:04 +0000 (13:28 +1100)
commitb180cb64366e70151e8f46591173a3813339e9e3
treeb57835ee84c9ec4d2b5b6a8e409508e7ffd57472
parent9089a35e9b98fe314c5c55bac8a4bf896bf4b132
parentbd82a2e4f2f2e8d761e2b70915ad284c01f354ff
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c
13 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-seaboard.c
sound/soc/au1x/db1200.c
sound/soc/ep93xx/ep93xx-pcm.c
sound/soc/imx/imx-pcm-dma-mx2.c
sound/soc/kirkwood/kirkwood-dma.c
sound/soc/mxs/mxs-saif.c
sound/soc/nuc900/nuc900-ac97.c
sound/soc/samsung/dma.c
sound/soc/txx9/txx9aclc.c