summaryrefslogtreecommitdiffstats
path: root/sound/soc/s6000
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-15 15:48:19 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-15 15:48:19 +0200
commita7e828896d5d131b58088e3ea076b865caf12663 (patch)
treea665e66480bd4a060e336421553268c71a2c304b /sound/soc/s6000
parentMerge branch 'for-3.1' into for-3.2 (diff)
parentASoC: ad193x: remove cache support (diff)
downloadlinux-a7e828896d5d131b58088e3ea076b865caf12663.tar.xz
linux-a7e828896d5d131b58088e3ea076b865caf12663.zip
Merge branch 'for-3.1' into for-3.2
Remove the bodge for ad193x. Conflicts: sound/soc/soc-io.c
Diffstat (limited to 'sound/soc/s6000')
0 files changed, 0 insertions, 0 deletions