aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-17 21:48:22 +0200
committerArnd Bergmann <arnd@arndb.de>2011-07-17 21:48:22 +0200
commitbc574e190d3fbed37d724e33a16aee326d6f2ac4 (patch)
treeecbd7238f1402783f122d2a1a0310bb2cdb1dd9a /sound/soc
parentLinux 3.0-rc5 (diff)
parentMerge branches 'omap4_clockdomain_hwmod_3.1', 'clock_debugfs_a_3.1', 'omap4_clock_auxclk_3.1' and 'omap_device_a_3.1' into prcm-devel-3.1 (diff)
parentMerge branch 'peter/topic/for-tony' of git://gitorious.org/omap-audio/linux-audio into twl-asoc (diff)
downloadlinux-dev-bc574e190d3fbed37d724e33a16aee326d6f2ac4.tar.xz
linux-dev-bc574e190d3fbed37d724e33a16aee326d6f2ac4.zip
Merge branches 'omap/prcm' and 'omap/mfd' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel-2