summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_local.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-03-07 08:05:15 (GMT)
committerTakashi Iwai <tiwai@suse.de>2012-03-07 08:05:15 (GMT)
commitfc7a1627c11bb6e4eb71fd8f792109754175f7bc (patch)
tree91dc5448a151d8fb57288a7cdef26c719fe02963 /sound/pci/hda/hda_local.h
parent78f8baf138311be3e170526388b0530a172bdbff (diff)
parent526af6eb4dc71302f59806e2ccac7793963a7fe0 (diff)
downloadlinux-fsl-qoriq-fc7a1627c11bb6e4eb71fd8f792109754175f7bc.tar.xz
Merge branch 'fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_realtek.c
Diffstat (limited to 'sound/pci/hda/hda_local.h')
0 files changed, 0 insertions, 0 deletions