Merge commit 'refs/next/20110922/sound'

diff --cc arch/arm/mach-ep93xx/edb93xx.c
Simple merge

diff --cc arch/arm/mach-ep93xx/simone.c
Simple merge

diff --cc arch/arm/mach-ep93xx/snappercl15.c
Simple merge

diff --cc drivers/base/regmap/regmap.c
Simple merge

diff --cc include/linux/regulator/consumer.h
Simple merge