summaryrefslogtreecommitdiff
path: root/arch/um/sys-ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-13 16:10:06 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-13 16:10:06 +0200
commit13ead805c5a14b0e7ecd34f61404a5bfba655895 (patch)
tree0ce86d4d10ab0398c31e5b630060309d362144d6 /arch/um/sys-ia64
parentebf546cc5391b9a8a17c1196b05b4357ef0138a2 (diff)
parentdf577149594cefacd62740e86de080c6336d699e (diff)
Merge branch 'perf-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull watchdog fixes from Ingo Molnar: "Two small watchdog subsystem fixes" * 'perf-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: watchdog: Fix print-once on enable watchdog: Remove unnecessary header files
Diffstat (limited to 'arch/um/sys-ia64')
0 files changed, 0 insertions, 0 deletions