David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net ...

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

2011-09-22 03:23:13 -04:00

..

acquirewdt.c

…

advantechwdt.c

…

adx_wdt.c

…

alim1535_wdt.c

…

alim7101_wdt.c

…

ar7_wdt.c

…

at32ap700x_wdt.c

watchdog: update author email for at32ap700x_wdt

2011-06-28 20:01:25 +00:00

at91rm9200_wdt.c

…

at91sam9_wdt.c

watchdog: at91sam9/wdt: move register header to drivers

2011-07-26 21:22:15 +00:00

at91sam9_wdt.h

watchdog: at91sam9/wdt: move register header to drivers

2011-07-26 21:22:15 +00:00

ath79_wdt.c

…

bcm47xx_wdt.c

bcm47xx: add support for bcma bus

2011-08-08 14:29:32 -04:00

bcm63xx_wdt.c

…

bfin_wdt.c

…

booke_wdt.c

…

coh901327_wdt.c

…

cpu5wdt.c

…

cpwd.c

…

davinci_wdt.c

…

dw_wdt.c

watchdog: add support for the Synopsys DesignWare WDT

2011-07-22 08:57:38 +00:00

ep93xx_wdt.c

…

eurotechwdt.c

…

f71808e_wdt.c

…

gef_wdt.c

watchdog: gef_wdt: fix MODULE_ALIAS

2011-06-28 07:43:00 +00:00

geodewdt.c

…

hpwdt.c

watchdog: hpwdt: prevent multiple "NMI occurred" messages

2011-09-20 14:24:54 +02:00

i6300esb.c

…

ib700wdt.c

…

ibmasr.c

…

imx2_wdt.c

watchdog: imx2_wdt: add device tree probe support

2011-07-26 21:19:16 +00:00

indydog.c

…

intel_scu_watchdog.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

intel_scu_watchdog.h

…

iop_wdt.c

…

it87_wdt.c

watchdog: Use "request_muxed_region" in it87 watchdog drivers

2011-07-22 08:55:23 +00:00

it8712f_wdt.c

watchdog: it8712f_wdt.c: improve includes

2011-07-26 21:28:23 +00:00

iTCO_vendor_support.c

…

iTCO_vendor.h

…

iTCO_wdt.c

watchdog: remove empty pm-functions

2011-07-26 21:21:16 +00:00

ixp4xx_wdt.c

…

ixp2000_wdt.c

…

jz4740_wdt.c

…

Kconfig

watchdog: Cleanup WATCHDOG_CORE help text

2011-08-02 08:23:07 +00:00

ks8695_wdt.c

…

lantiq_wdt.c

watchdog: lantiq: fix watchdogs timeout handling

2011-09-20 14:28:24 +02:00

m54xx_wdt.c

…

machzwd.c

…

Makefile

watchdog: WatchDog Timer Driver Core - Add basic framework

2011-07-28 08:01:04 +00:00

max63xx_wdt.c

…

mixcomwd.c

…

mpc8xxx_wdt.c

drivercore: revert addition of of_match to struct device

2011-05-18 12:32:23 -06:00

mpcore_wdt.c

watchdog: mpcore_wdt: Add suspend/resume support.

2011-07-22 09:00:20 +00:00

mtx-1_wdt.c

watchdog: mtx1-wdt: use dev_{err,info} instead of printk()

2011-07-22 08:59:43 +00:00

mv64x60_wdt.c

…

nuc900_wdt.c

…

nv_tco.c

watchdog: Fix POST failure on ASUS P5N32-E SLI and similar boards

2011-08-02 08:22:54 +00:00

nv_tco.h

…

octeon-wdt-main.c

…

octeon-wdt-nmi.S

…

of_xilinx_wdt.c

watchdog: Add Xilinx watchdog timer driver

2011-07-26 21:21:29 +00:00

omap_wdt.c

…

omap_wdt.h

…

orion_wdt.c

…

pc87413_wdt.c

watchdog: pc87413_wdt: Cleanup pc87413 watchdog driver to use

2011-07-22 08:56:41 +00:00

pcwd_pci.c

…

pcwd_usb.c

…

pcwd.c

…

pika_wdt.c

…

pnx833x_wdt.c

…

pnx4008_wdt.c

…

rc32434_wdt.c

…

rdc321x_wdt.c

mfd: Use mfd cell platform_data for rdc321x cells platform bits

2011-05-26 19:45:06 +02:00

riowd.c

…

s3c2410_wdt.c

watchdog: s3c2410: Add support for device tree based probe

2011-07-22 09:00:43 +00:00

sa1100_wdt.c

…

sb_wdog.c

…

sbc60xxwdt.c

…

sbc7240_wdt.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

sbc8360.c

…

sbc_epx_c3.c

watchdog: Initconst section fixes for watchdog

2011-09-20 14:32:00 +02:00

sbc_fitpc2_wdt.c

…

sc520_wdt.c

…

sc1200wdt.c

…

sch311x_wdt.c

watchdog: remove empty pm-functions

2011-07-26 21:21:16 +00:00

scx200_wdt.c

…

shwdt.c

watchdog: shwdt: fix usage of mod_timer

2011-08-02 08:22:49 +00:00

smsc37b787_wdt.c

…

softdog.c

…

sp805_wdt.c

watchdog: sp805: Flush posted writes in enable/disable.

2011-07-26 21:19:56 +00:00

sp5100_tco.c

…

sp5100_tco.h

…

stmp3xxx_wdt.c

…

ts72xx_wdt.c

…

twl4030_wdt.c

…

txx9wdt.c

…

w83627hf_wdt.c

…

w83697hf_wdt.c

…

w83697ug_wdt.c

…

w83877f_wdt.c

…

w83977f_wdt.c

…

wafer5823wdt.c

…

watchdog_core.c

watchdog: WatchDog Timer Driver Core - Add minimum and max timeout

2011-07-28 08:01:18 +00:00

watchdog_dev.c

watchdog: WatchDog Timer Driver Core - use passed watchdog_device

2011-09-20 14:22:28 +02:00

watchdog_dev.h

watchdog: WatchDog Timer Driver Core - Add basic framework

2011-07-28 08:01:04 +00:00

wd501p.h

…

wdrtas.c

…

wdt285.c

…

wdt977.c

…

wdt_pci.c

…

wdt.c

…

wm831x_wdt.c

watchdog: Handle multiple wm831x watchdogs being registered

2011-06-28 07:42:16 +00:00

wm8350_wdt.c

…

xen_wdt.c

…