git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0a332db 7c81c85)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 02:27:18 +0000 (13:27 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 02:27:18 +0000 (13:27 +1100)
commit	f0180912549a706380e087bfc9f3a31a18af4ce2
tree	bfdb257c69948bfbf2e8e3e12f3316a28be02352	tree \| snapshot
parent	0a332dbd12928a3f0eaaccb69272f33d2b790579	commit \| diff
parent	7c81c8563179b181f19c889b2e21be5fcf5db974	commit \| diff

Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c

13 files changed:

Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-harmony.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-seaboard.c	diff1 \|	diff2 \|	blob \| history
sound/soc/au1x/db1200.c	diff1 \|	diff2 \|	blob \| history
sound/soc/ep93xx/ep93xx-pcm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/imx/imx-pcm-dma-mx2.c	diff1 \|	diff2 \|	blob \| history
sound/soc/kirkwood/kirkwood-dma.c	diff1 \|	diff2 \|	blob \| history
sound/soc/mxs/mxs-saif.c	diff1 \|	diff2 \|	blob \| history
sound/soc/nuc900/nuc900-ac97.c	diff1 \|	diff2 \|	blob \| history
sound/soc/samsung/dma.c	diff1 \|	diff2 \|	blob \| history
sound/soc/txx9/txx9aclc.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules