diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 20:09:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 20:09:29 -0400 |
| commit | 4b0e976c663e808822adf51274f948e8a4986f06 (patch) | |
| tree | 64ee15cbaafc283248dfac5dc7bccbc65b9159e0 /drivers/watchdog/mpc8xxx_wdt.c | |
| parent | 19520fc1ee36164808e6f084bd95e8178e2db231 (diff) | |
| parent | 112e75466f63997d0f4c3c13ecf999e36aea692f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
watchdog: booke_wdt: clean up status messages
watchdog: cleanup spaces before tabs
watchdog: convert to DEFINE_PCI_DEVICE_TABLE
watchdog: Xen watchdog driver
watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms.
watchdog: jz4740_wdt - fix magic character checking
watchdog: add JZ4740 watchdog driver
watchdog: it87_wdt: Add support for IT8721F watchdog
watchdog: hpwdt: build hpwdt as module by default with NMI_DECODING enabled
watchdog: hpwdt: Fix a couple of typos
Diffstat (limited to 'drivers/watchdog/mpc8xxx_wdt.c')
| -rw-r--r-- | drivers/watchdog/mpc8xxx_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index ea438ad53055..6709d723e017 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c | |||
| @@ -2,9 +2,9 @@ | |||
| 2 | * mpc8xxx_wdt.c - MPC8xx/MPC83xx/MPC86xx watchdog userspace interface | 2 | * mpc8xxx_wdt.c - MPC8xx/MPC83xx/MPC86xx watchdog userspace interface |
| 3 | * | 3 | * |
| 4 | * Authors: Dave Updegraff <dave@cray.org> | 4 | * Authors: Dave Updegraff <dave@cray.org> |
| 5 | * Kumar Gala <galak@kernel.crashing.org> | 5 | * Kumar Gala <galak@kernel.crashing.org> |
| 6 | * Attribution: from 83xx_wst: Florian Schirmer <jolt@tuxbox.org> | 6 | * Attribution: from 83xx_wst: Florian Schirmer <jolt@tuxbox.org> |
| 7 | * ..and from sc520_wdt | 7 | * ..and from sc520_wdt |
| 8 | * Copyright (c) 2008 MontaVista Software, Inc. | 8 | * Copyright (c) 2008 MontaVista Software, Inc. |
| 9 | * Anton Vorontsov <avorontsov@ru.mvista.com> | 9 | * Anton Vorontsov <avorontsov@ru.mvista.com> |
| 10 | * | 10 | * |