summaryrefslogtreecommitdiff
path: root/sound/pci/mixart
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-03-18 10:04:42 (GMT)
committerTakashi Iwai <tiwai@suse.de>2013-03-18 10:04:42 (GMT)
commitcf30f46acde1f84fbf603bba6540cbb40cc6c954 (patch)
tree2652b3fd1fbc4c379ee5325579fe60eae75421f1 /sound/pci/mixart
parent0959f22ee66734c212fc733f7616ba321ef7f47f (diff)
parenta86b1a2cd2f81f74e815e07f756edd7bc5b6f034 (diff)
downloadlinux-fsl-qoriq-cf30f46acde1f84fbf603bba6540cbb40cc6c954.tar.xz
Merge branch 'for-linus' into for-next
Back-merged for refactoring beep stuff.
Diffstat (limited to 'sound/pci/mixart')
0 files changed, 0 insertions, 0 deletions