- net-next.git - net-next plumbings
summaryrefslogtreecommitdiff
path: root/sound/mips/ad1843.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-18 11:12:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-18 11:12:13 -0800
commit0b75f821ec8be459dd4dec77be39595d989d77ac (patch)
tree8d5e5132ddf28928d44347c78102233b042f480e /sound/mips/ad1843.c
parent49b550fee80b5f36b961640666f7945d7ec63000 (diff)
parentbc7c36eedb0c7004aa06c2afc3c5385adada8fa3 (diff)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar: "Fix a crash in the ARM-Exynos clocksource driver, triggered by CPU hotplug operations" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource/exynos_mct: Clear interrupt when cpu is shut down
Diffstat (limited to 'sound/mips/ad1843.c')
/linux/net-next.git/diff/tools/perf/arch/sparc/include/dwarf-regs-table.h?id=c92816275674c1491ce228ee49aa030a5fa1be04&id2=c8a6a09c1c617402cc9254b2bc8da359a0347d75'>diff)
Merge tag 'char-misc-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH: "Here are some small char/misc driver fixes for 4.10-rc4 that resolve some reported issues. The MEI driver issue resolves a lot of problems that people have been having, as does the mem driver fix. The other minor fixes resolve other reported issues. All of these have been in linux-next for a while" * tag 'char-misc-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: vme: Fix wrong pointer utilization in ca91cx42_slave_get auxdisplay: fix new ht16k33 build errors ppdev: don't print a free'd string extcon: return error code on failure drivers: char: mem: Fix thinkos in kmem address checks mei: bus: enable OS version only for SPT and newer
Diffstat (limited to 'tools/perf/arch/sparc/include/dwarf-regs-table.h')