summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-21 19:14:15 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-21 19:14:15 +0100
commit34acae3ce3472f6365d5724252f82032bbc06d63 (patch)
tree842f22458bcf01c48e527e8d8848d8d014aa2518 /drivers/watchdog
parentMerge tag 'pm+acpi-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentSparc: sparc_cpu_model isn't in asm/system.h any more [ver #2] (diff)
downloadlinux-34acae3ce3472f6365d5724252f82032bbc06d63.tar.xz
linux-34acae3ce3472f6365d5724252f82032bbc06d63.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller: "Three minor fixes from David Howells and Paul Gortmaker" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: Sparc: sparc_cpu_model isn't in asm/system.h any more [ver #2] sparc32: make copy_to/from_user_page() usable from modular code sparc32: fix build failure for arch_jump_label_transform
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions