summaryrefslogtreecommitdiff
path: root/sound/isa/azt2320.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-09-11 14:46:36 (GMT)
committerTakashi Iwai <tiwai@suse.de>2012-09-11 14:46:36 (GMT)
commit05288426908ecb7ed7cbff61901db5918525578a (patch)
tree94a814cfdd53a011a10da09201ed08a6572175ff /sound/isa/azt2320.c
parentb35aabd78ddae8300fda7e6a1ac6f0484ef3e804 (diff)
parentc302d6133c094bda7a7ce94eac5b50c018a7ca7b (diff)
downloadlinux-fsl-qoriq-05288426908ecb7ed7cbff61901db5918525578a.tar.xz
Merge branch 'for-linus' into for-next
To merge HD-audio fixes back to 3.7 development line
Diffstat (limited to 'sound/isa/azt2320.c')
0 files changed, 0 insertions, 0 deletions