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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6c3e37d 87a3366)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 19 Dec 2011 03:00:07 +0000 (14:00 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 19 Dec 2011 03:00:07 +0000 (14:00 +1100)
commit	182c069636a15638d1cc3ad4c41ac476074a4dae
tree	68cf60c7284f712927a84ab41a6d8589e4391bb6	tree \| snapshot
parent	6c3e37d43f079886154bc502bb5acaa34413c4a6	commit \| diff
parent	87a33664d7b7e439439a377b08e0cb7b6906180d	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