Tony Lindgren d702d12167 Merge with mainline to remove plat-omap/Kconfig conflict ...

Conflicts:
	arch/arm/plat-omap/Kconfig

2010-03-01 14:19:05 -08:00

..

acquirewdt.c

…

advantechwdt.c

…

adx_wdt.c

[WATCHDOG] use resource_size()

2009-12-23 19:53:04 +00:00

alim1535_wdt.c

…

alim7101_wdt.c

…

ar7_wdt.c

MIPS: AR7: Implement clock API

2010-02-27 12:53:16 +01:00

at32ap700x_wdt.c

[WATCHDOG] use resource_size()

2009-12-23 19:53:04 +00:00

at91rm9200_wdt.c

…

at91sam9_wdt.c

…

bcm47xx_wdt.c

…

bfin_wdt.c

[WATCHDOG] bfin: fix max timeout calculation

2010-02-21 19:16:30 +00:00

booke_wdt.c

…

coh901327_wdt.c

…

cpu5wdt.c

…

cpwd.c

…

davinci_wdt.c

[WATCHDOG] use resource_size()

2009-12-23 19:53:04 +00:00

ep93xx_wdt.c

…

eurotechwdt.c

…

gef_wdt.c

…

geodewdt.c

watchdog: update geodewdt for new MFGPT API

2009-12-18 10:19:57 -08:00

hpwdt.c

…

i6300esb.c

…

ib700wdt.c

…

ibmasr.c

…

indydog.c

…

iop_wdt.c

…

it87_wdt.c

…

it8712f_wdt.c

…

iTCO_vendor_support.c

…

iTCO_vendor.h

…

iTCO_wdt.c

[WATCHDOG] iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs

2010-01-18 21:39:49 +00:00

ixp4xx_wdt.c

…

ixp2000_wdt.c

[WATCHDOG] ixp2000: Fix build failure caused by missing include

2010-01-19 20:43:19 +00:00

Kconfig

omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3

2010-02-15 09:27:02 -08:00

ks8695_wdt.c

…

machzwd.c

…

Makefile

MIPS: eXcite: Remove platform.

2009-12-17 01:57:35 +00:00

mixcomwd.c

…

mpc8xxx_wdt.c

…

mpcore_wdt.c

[WATCHDOG] use resource_size()

2009-12-23 19:53:04 +00:00

mtx-1_wdt.c

…

mv64x60_wdt.c

[WATCHDOG] use resource_size()

2009-12-23 19:53:04 +00:00

nuc900_wdt.c

…

omap_wdt.c

[WATCHDOG] use resource_size()

2009-12-23 19:53:04 +00:00

omap_wdt.h

…

orion_wdt.c

…

pc87413_wdt.c

…

pcwd_pci.c

…

pcwd_usb.c

…

pcwd.c

…

pika_wdt.c

…

pnx833x_wdt.c

…

pnx4008_wdt.c

ARM: PNX4008: convert watchdog to use clk API enable/disable calls

2010-02-12 17:32:37 +00:00

rc32434_wdt.c

…

rdc321x_wdt.c

…

riowd.c

…

s3c2410_wdt.c

[WATCHDOG] use resource_size()

2009-12-23 19:53:04 +00:00

sa1100_wdt.c

…

sb_wdog.c

…

sbc60xxwdt.c

…

sbc7240_wdt.c

…

sbc8360.c

…

sbc_epx_c3.c

…

sbc_fitpc2_wdt.c

[WATCHDOG] sbc_fitpc2_wdt: fix I/O space access technique.

2010-01-25 19:48:49 +00:00

sc520_wdt.c

…

sc1200wdt.c

…

sch311x_wdt.c

…

scx200_wdt.c

…

shwdt.c

…

smsc37b787_wdt.c

…

softdog.c

…

stmp3xxx_wdt.c

…

twl4030_wdt.c

mfd: Rename all twl4030_i2c*

2009-12-13 21:23:33 +01:00

txx9wdt.c

[WATCHDOG] use resource_size()

2009-12-23 19:53:04 +00:00

w83627hf_wdt.c

…

w83697hf_wdt.c

…

w83697ug_wdt.c

…

w83877f_wdt.c

…

w83977f_wdt.c

…

wafer5823wdt.c

…

wd501p.h

…

wdrtas.c

…

wdt285.c

…

wdt977.c

…

wdt_pci.c

…

wdt.c

…

wm831x_wdt.c

…

wm8350_wdt.c

…