diff options
| author | Takashi Iwai | 2016-04-04 11:51:08 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2016-04-04 11:51:08 +0200 |
| commit | a99e31512aa435e8391ba5f5e64abeac9c5f2f32 (patch) | |
| tree | 56bb9d9ccfe76520b672249757e25f686275b204 /sound/pci/hda/patch_hdmi.c | |
| parent | ALSA: firewire-digi00x: delayed registration of sound card (diff) | |
| parent | ALSA: usb-audio: Add a sample rate quirk for Phoenix Audio TMX320 (diff) | |
| download | kernel-qcow2-linux-a99e31512aa435e8391ba5f5e64abeac9c5f2f32.tar.gz kernel-qcow2-linux-a99e31512aa435e8391ba5f5e64abeac9c5f2f32.tar.xz kernel-qcow2-linux-a99e31512aa435e8391ba5f5e64abeac9c5f2f32.zip | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/hda/hdac_i915.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
0 files changed, 0 insertions, 0 deletions