Benjamin Herrenschmidt 84c3d4aaec Merge commit 'origin/master' ...

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/kernel/stacktrace.c
	arch/powerpc/mm/slice.c
	arch/ppc/kernel/smp.c

2008-07-16 11:07:59 +10:00

..

acquirewdt.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

advantechwdt.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

alim1535_wdt.c

[WATCHDOG] misc_register patch

2008-01-25 20:31:50 +00:00

alim7101_wdt.c

[WATCHDOG] misc_register patch

2008-01-25 20:31:50 +00:00

ar7_wdt.c

[WATCHDOG] constify function pointer tables

2008-01-25 20:41:30 +00:00

at32ap700x_wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

at91rm9200_wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

bfin_wdt.c

[WATCHDOG] Blackfin Watchdog Driver: split platform device/driver

2008-05-25 09:01:36 +00:00

booke_wdt.c

generic-ipi: more merge fallout

2008-07-15 22:08:52 +02:00

cpu5wdt.c

[WATCHDOG] Remove volatiles from watchdog device structures

2008-03-06 11:30:32 +00:00

davinci_wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

ep93xx_wdt.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

eurotechwdt.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

geodewdt.c

drivers/watchdog/geodewdt.c: build fix

2008-05-30 10:16:58 -07:00

hpwdt.c

[watchdog] hpwdt: fix use of inline assembly

2008-06-20 12:25:34 -07:00

i6300esb.c

[WATCHDOG] spin_lock_init() fixes

2007-11-02 19:09:07 +00:00

ib700wdt.c

[WATCHDOG] spin_lock_init() fixes

2007-11-02 19:09:07 +00:00

ibmasr.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

indydog.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

iop_wdt.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

it8712f_wdt.c

[WATCHDOG] it8712f_wdt Zero MSB timeout byte when disabling watchdog

2008-04-06 19:12:22 +00:00

iTCO_vendor_support.c

Convert files to UTF-8 and some cleanups

2007-10-19 23:21:04 +02:00

iTCO_wdt.c

[WATCHDOG] Add ICH9DO into the iTCO_wdt.c driver

2008-05-25 09:45:39 +00:00

ixp4xx_wdt.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

ixp2000_wdt.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

Kconfig

[WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers

2008-05-25 09:02:17 +00:00

ks8695_wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

machzwd.c

[WATCHDOG] replace remaining __FUNCTION__ occurrences

2008-03-06 11:30:26 +00:00

Makefile

Revert "[WATCHDOG] hpwdt: Add CFLAGS to get driver working"

2008-06-24 13:09:26 +00:00

mixcomwd.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

mpc8xx_wdt.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

mpc83xx_wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

mpc5200_wdt.c

powerpc/mpc5200_wdt: use linux/of_platform.h instead of asm

2008-07-12 12:10:53 -06:00

mpcore_wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

mtx-1_wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

mv64x60_wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

omap_wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

omap_wdt.h

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

pc87413_wdt.c

[WATCHDOG] spin_lock_init() fixes

2007-11-02 19:09:07 +00:00

pcwd_pci.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

pcwd_usb.c

[WATCHDOG] replace remaining __FUNCTION__ occurrences

2008-03-06 11:30:26 +00:00

pcwd.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

pnx4008_wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

rm9k_wdt.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

s3c2410_wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

sa1100_wdt.c

remove asm/bitops.h includes

2007-10-19 11:53:41 -07:00

sb_wdog.c

[WATCHDOG] Add support for SB1 hardware watchdog

2008-02-18 16:53:47 +00:00

sbc60xxwdt.c

[WATCHDOG] misc_register patch

2008-01-25 20:31:50 +00:00

sbc7240_wdt.c

[WATCHDOG] add Nano 7240 driver

2007-12-04 16:48:06 +00:00

sbc8360.c

[WATCHDOG] spin_lock_init() fixes

2007-11-02 19:09:07 +00:00

sbc_epx_c3.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

sc520_wdt.c

[WATCHDOG] spin_lock_init() fixes

2007-11-02 19:09:07 +00:00

sc1200wdt.c

Convert asm/semaphore.h users to linux/semaphore.h

2008-04-18 22:22:54 -04:00

scx200_wdt.c

[WATCHDOG] misc_register patch

2008-01-25 20:31:50 +00:00

shwdt.c

[WATCHDOG] replace remaining __FUNCTION__ occurrences

2008-03-06 11:30:26 +00:00

smsc37b787_wdt.c

[WATCHDOG] spin_lock_init() fixes

2007-11-02 19:09:07 +00:00

softdog.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

txx9wdt.c

watchdog: fix platform driver hotplug/coldplug

2008-04-11 08:06:44 -07:00

w83627hf_wdt.c

[WATCHDOG] spin_lock_init() fixes

2007-11-02 19:09:07 +00:00

w83697hf_wdt.c

[WATCHDOG] Add w83697h_wdt early_disable option

2008-05-25 09:00:51 +00:00

w83877f_wdt.c

[WATCHDOG] misc_register patch

2008-01-25 20:31:50 +00:00

w83977f_wdt.c

[WATCHDOG] misc_register patch

2008-01-25 20:31:50 +00:00

wafer5823wdt.c

[WATCHDOG] spin_lock_init() fixes

2007-11-02 19:09:07 +00:00

wd501p.h

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

wdrtas.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

wdt285.c

mv watchdog tree under drivers

2007-10-18 10:39:03 +00:00

wdt977.c

[WATCHDOG] misc_register patch

2008-01-25 20:31:50 +00:00

wdt_pci.c

[WATCHDOG] spin_lock_init() fixes

2007-11-02 19:09:07 +00:00

wdt.c

[WATCHDOG] wdt: fix locking

2008-01-25 20:23:28 +00:00