Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 28 Nov 2014 17:30:19 +0000 (18:30 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 28 Nov 2014 17:30:19 +0000 (18:30 +0100)
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.


Trivial merge