summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/f71808e_wdt.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-30 20:43:26 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-30 20:43:26 +0200
commitf02a38d86a14b6e544e218d806ffb0442785f62b (patch)
tree84aace4aaf4b018c48f25ec2831888354baae16c /drivers/watchdog/f71808e_wdt.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff)
parentMerge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentx86: Check irq_remapped instead of remapping_enabled in destroy_irq() (diff)
downloadlinux-f02a38d86a14b6e544e218d806ffb0442785f62b.tar.xz
linux-f02a38d86a14b6e544e218d806ffb0442785f62b.zip
Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: jump label: Add work around to i386 gcc asm goto bug x86, ftrace: Use safe noops, drop trap test jump_label: Fix unaligned traps on sparc. jump label: Make arch_jump_label_text_poke_early() optional jump label: Fix error with preempt disable holding mutex oprofile: Remove deprecated use of flush_scheduled_work() oprofile: Fix the hang while taking the cpu offline jump label: Fix deadlock b/w jump_label_mutex vs. text_mutex jump label: Fix module __init section race * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Check irq_remapped instead of remapping_enabled in destroy_irq()