]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 02:36:35 +0000 (13:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 02:36:35 +0000 (13:36 +1100)
commitd1f6fc55039d6a2d04acc42a69dd9479d9f4a6a4
tree68d3a319e732fba763e74522d7da448ba12a4d18
parentd5aa8953baa253f5e0a05366e8f7b5eac20d0a2d
parent9bf3eaa109f82a6d8e262c435c269bad475b7fa4
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/plat-omap/devices.c
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