]> 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, 14 Dec 2011 02:32:20 +0000 (13:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 02:32:20 +0000 (13:32 +1100)
commitdb5e50bf83ff4e116c09dec879f94d01d564c3f4
tree5f58e3bb77a1e1458382a4364c8e86f3349a4097
parente73718f5373b4a4229d502f62197553299df5791
parentad761881b8417e58bb22664b66117d36af1339bd
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c
12 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/mxs/mxs-saif.c
sound/soc/nuc900/nuc900-ac97.c
sound/soc/samsung/dma.c
sound/soc/txx9/txx9aclc.c