summaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-03-11 23:45:54 +0100
committerDan Williams <dan.j.williams@intel.com>2011-03-11 23:45:54 +0100
commitf5539af572ffa35545f21f604fb747eae55c8042 (patch)
tree86b0e51b9257ce8ffc63bebb379259e7f4ff4bf9 /sound/oss
parentMerge branch 'dw_dmac' into dmaengine (diff)
parentdmaengine: add slave-dma maintainer (diff)
downloadlinux-f5539af572ffa35545f21f604fb747eae55c8042.tar.xz
linux-f5539af572ffa35545f21f604fb747eae55c8042.zip
Merge branch 'dmaengine-fixes' into dmaengine
Diffstat (limited to 'sound/oss')
0 files changed, 0 insertions, 0 deletions