]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 03:21:41 +0000 (13:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 03:21:41 +0000 (13:21 +1000)
commit48be39b4ca4f7d316a14a6622372e6effdd76e92
tree54a24fbd9739234014c9515fa7824b8bb7725ccb
parent963a61c562e93c1994cdf58dbba98a8b34fa19cc
parent7940bb741e21a2d6c45c16012dbabc06cbbd3956
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
arch/arm/mach-ep93xx/simone.c
arch/arm/mach-ep93xx/snappercl15.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/plat-omap/devices.c
arch/mips/alchemy/devboards/db1200/platform.c
arch/mips/alchemy/devboards/db1x00/platform.c
drivers/base/regmap/regmap.c
include/linux/regulator/consumer.h
sound/mips/Kconfig
sound/soc/au1x/Kconfig
sound/soc/samsung/ac97.c