]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:09:09 +0000 (14:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:09:09 +0000 (14:09 +1100)
commit9242d2848ceecb98fffbdbf2a033a96d1ece0a8a
tree27e215fdf79bf7e93a0c15f62f2d458d6de68cbc
parent03105ce213b9e080f136d5a1d294d9a24a10473f
parent4fc90ea010f8c6f12b3975807bf302c6a7df61ec
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