diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-06 20:58:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-01-06 21:14:35 +0100 |
| commit | 9d9938854efcf2f21381b930bc1324e95640e0c4 (patch) | |
| tree | 7b136c25af5fcc64258f3427f985c1dc667ae0bd /sound/usb | |
| parent | Merge branch 'for-linus' into for-next (diff) | |
| parent | Merge tag 'asoc-fix-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-9d9938854efcf2f21381b930bc1324e95640e0c4.tar.xz linux-9d9938854efcf2f21381b930bc1324e95640e0c4.zip | |
Merge branch 'for-linus' into for-next
Conflicts:
drivers/gpu/drm/i915/intel_display.c
sound/soc/intel/skylake/skl.h
Diffstat (limited to 'sound/usb')
0 files changed, 0 insertions, 0 deletions