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)
commit50314663877b3c5f08b2573c0bb161b6a2c63c3e
treeeda596ffce10fae670168e2d7aa797f5a1b0a2a7
parent6874daad4b0fbed5b2f9bef7f4d3f2b895463a95
parentd42472ecffd7c42086c6e5b1335c99a3adf58a09
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.
include/sound/pcm.h
sound/core/pcm.c
sound/pci/hda/patch_realtek.c
sound/usb/quirks.c