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: 9e42127 9aa7997)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 27 Sep 2011 03:01:42 +0000 (13:01 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 27 Sep 2011 03:01:42 +0000 (13:01 +1000)
commit	439dbc06488fe2386c7aadc70083ff75421d93dc
tree	d175d29fa6445affe8335458d11583f3daa5973e	tree \| snapshot
parent	9e421272fd52c81f5c913ea48d1af1701e83ce27	commit \| diff
parent	9aa7997a9778d679134ab088e48dd7d141cf5ac1	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