summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-12-04 14:48:17 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-12-04 14:48:17 +0100
commit33e0aae11e4854c792e9871f94da6d28bf2e2bb8 (patch)
treed75422fcd621bb1a4ec019f7ab625e3bc99ffaff /sound/pci/hda
parent9fb1f39eb2d6707d265087ee186376e24995f55a (diff)
parenteb7cce1ea96b6399672abce787598f6e7a4352c3 (diff)
downloadlinux-stable-33e0aae11e4854c792e9871f94da6d28bf2e2bb8.tar.gz
linux-stable-33e0aae11e4854c792e9871f94da6d28bf2e2bb8.tar.bz2
linux-stable-33e0aae11e4854c792e9871f94da6d28bf2e2bb8.zip
Merge branch 'mark-irqs' into devel
Conflicts: drivers/gpio/gpio-em.c
Diffstat (limited to 'sound/pci/hda')
0 files changed, 0 insertions, 0 deletions