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: (28 commits)
  [WATCHDOG] Fix pcwd_init_module crash
  [WATCHDOG] ICH9 support for iTCO_wdt
  [WATCHDOG] 631xESB/632xESB support for iTCO_wdt - add all LPC bridges
  [WATCHDOG] 631xESB/632xESB support for iTCO_wdt
  [WATCHDOG] omap_wdt.c - default error for IOCTL is -ENOTTY
  [WATCHDOG] Return value of nonseekable_open
  [WATCHDOG] mv64x60_wdt: Rework the timeout register manipulation
  [WATCHDOG] mv64x60_wdt: disable watchdog timer when driver is probed
  [WATCHDOG] mv64x60_wdt: Support the WDIOF_MAGICCLOSE feature
  [WATCHDOG] mv64x60_wdt: Add a module parameter to change nowayout setting
  [WATCHDOG] mv64x60_wdt: Add WDIOC_SETOPTIONS ioctl support
  [WATCHDOG] mv64x60_wdt: Support for WDIOC_SETTIMEOUT ioctl
  [WATCHDOG] mv64x60_wdt: Fix WDIOC_GETTIMEOUT return value
  [WATCHDOG] mv64x60_wdt: Check return value of nonseekable_open
  [WATCHDOG] mv64x60_wdt: Add arch/powerpc platform support
  [WATCHDOG] mv64x60_wdt: Get register address from platform data
  [WATCHDOG] mv64x60_wdt: set up platform_device in platform code
  [WATCHDOG] ensure mouse and keyboard ignored in w83627hf_wdt
  [WATCHDOG] s3c2410_wdt: fixup after arch include moves
  [WATCHDOG] git-watchdog-typo
  ...

diff --combined MAINTAINERS
index c292897607417894ab59d7565877a827d33df7a2,2ca352b235f8ebd88c7680ac6836456d05ab4d87..1e15a0edc313ce38b1cb6fa68592aa6ac5de77ca
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -387,6 -387,21 +387,6 @@@ P:        Jaya Kuma
  M:    jayalk@intworks.biz
  S:    Maintained
  
 -ARM26 ARCHITECTURE
 -P:    Ian Molton
 -M:    spyro@f2s.com
 -S:    Maintained
 -
 -ARM26/ARCHIMEDES
 -P:    Ian Molton
 -M:    spyro@f2s.com
 -S:    Maintained
 -
 -ARM26/A5000
 -P:    John Appleby
 -M:    john@dnsworld.co.uk
 -S:    Maintained
 -
  ARM MFM AND FLOPPY DRIVERS
  P:    Ian Molton
  M:    spyro@f2s.com
@@@ -756,6 -771,14 +756,14 @@@ L:       uclinux-dist-devel@blackfin.uclinux.
  W:    http://blackfin.uclinux.org
  S:    Supported
  
+ BLACKFIN WATCHDOG DRIVER
+ P:    Mike Frysinger
+ M:    michael.frysinger@analog.com
+ M:    vapier.adi@gmail.com
+ L:    uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+ W:    http://blackfin.uclinux.org
+ S:    Supported
+ 
  BAYCOM/HDLCDRV DRIVERS FOR AX.25
  P:    Thomas Sailer
  M:    t.sailer@alumni.ethz.ch
@@@ -2156,8 -2179,6 +2164,8 @@@ W:      http://www.kerneljanitors.org
  S:    Maintained
  
  KERNEL NFSD
 +P:    J. Bruce Fields
 +M:    bfields@fieldses.org
  P:    Neil Brown
  M:    neilb@suse.de
  L:    nfs@lists.sourceforge.net
@@@ -3326,14 -3347,6 +3334,14 @@@ M:    thomas@winischhofer.ne
  W:    http://www.winischhofer.at/linuxsisusbvga.shtml
  S:    Maintained
  
 +SLAB ALLOCATOR
 +P:    Christoph Lameter
 +M:    clameter@sgi.com
 +P:    Pekka Enberg
 +M:    penberg@cs.helsinki.fi
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +
  SMC91x ETHERNET DRIVER
  P:    Nicolas Pitre
  M:    nico@cam.org
@@@ -3661,9 -3674,11 +3669,9 @@@ W:     http://www.auk.cx/tms380tr
  S:    Maintained
  
  TULIP NETWORK DRIVER
 -P:    Valerie Henson
 -M:    val@nmt.edu
  L:    tulip-users@lists.sourceforge.net
  W:    http://sourceforge.net/projects/tulip/
 -S:    Maintained
 +S:    Orphan
  
  TUN/TAP driver
  P:    Maxim Krasnyansky

diff --combined drivers/char/Makefile
index 23b26b87cc3296e1cd9ecc97ed37633a6ec78f1f,2bc3a55ee407523d342d7c7bcd71a9d6bfb9ac96..d68ddbe70f737414a876c9f52cf1417223cbe8b7
--- 1/drivers/char/Makefile
--- 2/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -97,7 -97,6 +97,6 @@@ obj-$(CONFIG_GPIO_VR41XX)     += vr41xx_giu
  obj-$(CONFIG_GPIO_TB0219)     += tb0219.o
  obj-$(CONFIG_TELCLOCK)                += tlclk.o
  
- obj-$(CONFIG_WATCHDOG)                += watchdog/
  obj-$(CONFIG_MWAVE)           += mwave/
  obj-$(CONFIG_AGP)             += agp/
  obj-$(CONFIG_DRM)             += drm/
@@@ -109,9 -108,6 +108,9 @@@ obj-$(CONFIG_TCG_TPM)              += tpm
  
  obj-$(CONFIG_PS3_FLASH)               += ps3flash.o
  
 +obj-$(CONFIG_JS_RTC)          += js-rtc.o
 +js-rtc-y = rtc.o
 +
  # Files generated that shall be removed upon make clean
  clean-files := consolemap_deftbl.c defkeymap.c