diff options

author	Linus Torvalds <torvalds@linux-foundation.org>	2017-01-18 11:12:13 -0800
committer	Linus Torvalds <torvalds@linux-foundation.org>	2017-01-18 11:12:13 -0800
commit	0b75f821ec8be459dd4dec77be39595d989d77ac (patch)
tree	8d5e5132ddf28928d44347c78102233b042f480e /net/batman-adv/icmp_socket.h
parent	49b550fee80b5f36b961640666f7945d7ec63000 (diff)
parent	bc7c36eedb0c7004aa06c2afc3c5385adada8fa3 (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 'net/batman-adv/icmp_socket.h')


context:
space:
mode: