summaryrefslogtreecommitdiff
path: root/sound/firewire/dice.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-11-28 20:30:19 +0300
committerTakashi Iwai <tiwai@suse.de>2014-11-28 20:30:19 +0300
commit50314663877b3c5f08b2573c0bb161b6a2c63c3e (patch)
treeeda596ffce10fae670168e2d7aa797f5a1b0a2a7 /sound/firewire/dice.c
parent6874daad4b0fbed5b2f9bef7f4d3f2b895463a95 (diff)
parentd42472ecffd7c42086c6e5b1335c99a3adf58a09 (diff)
downloadlinux-50314663877b3c5f08b2573c0bb161b6a2c63c3e.tar.xz
Merge branch 'for-linus' into for-next
The commit [7a2e9ddc: ALSA: usb-audio: Add native DSD support for Denon/Marantz DACs] requires the new format definition that has landed only in for-next branch.
Diffstat (limited to 'sound/firewire/dice.c')
0 files changed, 0 insertions, 0 deletions