summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-14 17:43:35 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-14 17:43:59 +0200
commitfcd8d84a585f3578a9ebdd27e757495a27415322 (patch)
tree58f37676ad56d322e47d0fa7343afb85445f7649 /sound
parentMerge branch 'spear/clock' into next/clock (diff)
parentMerge branch 'spear/dt' into spear/clock (diff)
parentMerge branch 'imx/pinctrl' into imx/clock (diff)
downloadlinux-fcd8d84a585f3578a9ebdd27e757495a27415322.tar.xz
linux-fcd8d84a585f3578a9ebdd27e757495a27415322.zip
Merge branches 'spear/clock' and 'imx/clock' into next/clock
Updated to resolve dependencies. Signed-off-by: Arnd Bergmann <arnd@arndb.de>