summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-06-11 07:52:31 +0300
committerTakashi Iwai <tiwai@suse.de>2015-06-11 07:52:31 +0300
commit4af88a9c1ba2d39263eef003ea598c657014e59e (patch)
tree0470cb215c77b91147f23f55c63a733e3628a8cb /sound/usb
parent692af901df615b7783caaccdb287cddf2d7f6059 (diff)
parentbf06848bdbe549175d25d2327ab9f37d4bd556b7 (diff)
downloadlinux-4af88a9c1ba2d39263eef003ea598c657014e59e.tar.xz
Merge branch 'for-linus' into for-next
This merges and resolves the non-trivial conflicts with the recent fix for hda-i915 binding fallback. Conflicts: sound/pci/hda/hda_intel.c Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
0 files changed, 0 insertions, 0 deletions