diff options
| author | Takashi Iwai | 2015-06-12 08:10:20 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2015-06-12 08:10:20 +0200 |
| commit | cc1b76ed32607ba378986931e73b64231085816f (patch) | |
| tree | 2554500c3e743249afafd1857a3956aae1b2220e /sound/aoa/soundbus/sysfs.c | |
| parent | ALSA: HDA: remove the unused function declaration (diff) | |
| parent | ALSA: hda - Abort the probe without i915 binding for HSW/BDW (diff) | |
| download | kernel-qcow2-linux-cc1b76ed32607ba378986931e73b64231085816f.tar.gz kernel-qcow2-linux-cc1b76ed32607ba378986931e73b64231085816f.tar.xz kernel-qcow2-linux-cc1b76ed32607ba378986931e73b64231085816f.zip | |
Merge branch 'for-linus' into for-next
Yet another non-trivial conflicts resolution for the recent HD-audio fix.
Conflicts:
sound/pci/hda/hda_intel.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/aoa/soundbus/sysfs.c')
0 files changed, 0 insertions, 0 deletions