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: d3e524f 8ac91fe)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Sep 2011 01:37:40 +0000 (11:37 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Sep 2011 01:37:40 +0000 (11:37 +1000)
commit	f740a3f54c323cbf677dab2255336ec7c74c1e8e
tree	83f3cd78f9f866074bff6c581c5ac811cb22c08c	tree \| snapshot
parent	d3e524f64e774583077ccae4cfbff46bb28c067b	commit \| diff
parent	8ac91fe9276b6d518e900674496d87f0c168a5de	commit \| diff

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

Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig

13 files changed:

arch/arm/mach-ep93xx/edb93xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/simone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/snappercl15.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/devices.c	diff1 \|	diff2 \|	blob \| history
arch/mips/alchemy/devboards/db1200/platform.c	diff1 \|	diff2 \|	blob \| history
arch/mips/alchemy/devboards/db1x00/platform.c	diff1 \|	diff2 \|	blob \| history
drivers/base/regmap/regmap.c	diff1 \|	diff2 \|	blob \| history
include/linux/regulator/consumer.h	diff1 \|	diff2 \|	blob \| history
sound/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/soc/au1x/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/soc/samsung/ac97.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules