]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 02:11:54 +0000 (12:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 02:11:54 +0000 (12:11 +1000)
commit71f34fff31179042cf9d879ee060ce5e543dde81
treed0041f8752cb8216d95d9a00f4d4cbe29edeb758
parentf0214a5f9c7fcda047fd92befb1f66139ecc19b5
parent375524dbd04e7e3e659190d29dd236f5f50bb3e0
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig
arch/arm/mach-ep93xx/edb93xx.c
arch/arm/mach-ep93xx/simone.c
arch/arm/mach-ep93xx/snappercl15.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