Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 32 insertions, 0 deletions

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index 0187b1185323..ea09d0c974ea 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -340,6 +340,14 @@ config ITCO_WDT
           To compile this driver as a module, choose M here: the
           module will be called iTCO_wdt.
 
+config ITCO_VENDOR_SUPPORT
+        bool "Intel TCO Timer/Watchdog Specific Vendor Support"
+        depends on ITCO_WDT
+        ---help---
+          Add vendor specific support to the intel TCO timer based watchdog
+          devices. At this moment we only have additional support for some
+          SuperMicro Inc. motherboards.
+
 config SC1200_WDT
         tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
         depends on WATCHDOG && X86
@@ -363,6 +371,20 @@ config SCx200_WDT
 
           If compiled as a module, it will be called scx200_wdt.
 
+config PC87413_WDT
+        tristate "NS PC87413 watchdog"
+        depends on WATCHDOG && X86
+        ---help---
+          This is the driver for the hardware watchdog on the PC87413 chipset
+          This watchdog simply watches your kernel to make sure it doesn't
+          freeze, and if it does, it reboots your computer after a certain
+          amount of time.
+
+          To compile this driver as a module, choose M here: the
+          module will be called pc87413_wdt.
+
+          Most people will say N.
+ 
 config 60XX_WDT
         tristate "SBC-60XX Watchdog Timer"
         depends on WATCHDOG && X86
@@ -553,6 +575,16 @@ config INDYDOG
           timer expired and no process has written to /dev/watchdog during
           that time.
 
+config WDT_RM9K_GPI
+        tristate "RM9000/GPI hardware watchdog"
+        depends on WATCHDOG && CPU_RM9000
+        help
+          Watchdog implementation using the GPI hardware found on
+          PMC-Sierra RM9xxx CPUs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rm9k_wdt.
+
 # S390 Architecture
 
 config ZVM_WATCHDOG