diff options
| author | Takashi Iwai | 2015-06-11 06:52:31 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2015-06-11 06:52:31 +0200 |
| commit | 4af88a9c1ba2d39263eef003ea598c657014e59e (patch) | |
| tree | 0470cb215c77b91147f23f55c63a733e3628a8cb /sound/usb/mixer.c | |
| parent | ALSA: hda - Allow calling snd_hdac_i915_*() without actual binding (diff) | |
| parent | ALSA: hda - Continue probing even if i915 binding fails (diff) | |
| download | kernel-qcow2-linux-4af88a9c1ba2d39263eef003ea598c657014e59e.tar.gz kernel-qcow2-linux-4af88a9c1ba2d39263eef003ea598c657014e59e.tar.xz kernel-qcow2-linux-4af88a9c1ba2d39263eef003ea598c657014e59e.zip | |
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/mixer.c')
0 files changed, 0 insertions, 0 deletions