Linus Torvalds 67d2c36e90 Merge watchdog driver updates ...

Automated merge from

	master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

failed due to duplicate different changes to Kconfig file. Manually fixed
up. Hopefully.

2005-09-05 06:00:45 -07:00

..

acorn

…

acpi

…

atm

[ATM]: Fix dereference of uninitialized pointer in zatm

2005-09-02 12:18:03 -07:00

base

[PATCH] swsusp: switch pm_message_t to struct

2005-09-05 00:06:16 -07:00

block

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2005-09-05 00:11:50 -07:00

bluetooth

…

cdrom

…

char

Merge watchdog driver updates

2005-09-05 06:00:45 -07:00

cpufreq

…

crypto

…

dio

…

eisa

…

fc4

…

firmware

…

hwmon

…

i2c

…

ide

[PATCH] swsusp: prevent disks from spinning down and up

2005-09-05 00:06:16 -07:00

ieee1394

…

infiniband

…

input

[PATCH] mips: kludge envdev to build for 64-bit MIPS with 32-bit compat

2005-09-05 00:06:08 -07:00

isdn

…

macintosh

[PATCH] swsusp: switch pm_message_t to struct

2005-09-05 00:06:16 -07:00

mca

…

md

[CRYPTO]: Use CRYPTO_TFM_REQ_MAY_SLEEP where appropriate

2005-09-01 17:43:25 -07:00

media

[PATCH] swsusp: switch pm_message_t to struct

2005-09-05 00:06:16 -07:00

message

…

mfd

…

misc

[ARM] 2866/1: add i.MX set_mctrl / get_mctrl functions

2005-08-31 21:48:47 +01:00

mmc

[MMC] support for mmc chip select in wbsd

2005-09-03 16:45:49 +01:00

mtd

…

net

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2005-09-05 00:11:50 -07:00

nubus

…

oprofile

…

parisc

…

parport

…

pci

[PATCH] swsusp: switch pm_message_t to struct

2005-09-05 00:06:16 -07:00

pcmcia

[ARM] 2873/1: PCMCIA soc: Allow access to filesystems on CF at boot time

2005-09-03 19:39:25 +01:00

pnp

…

s390

[PATCH] s390: disconnected 3270 console

2005-09-05 00:06:29 -07:00

sbus

…

scsi

Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

2005-09-05 05:50:36 -07:00

serial

Merge master.kernel.org:/home/rmk/linux-2.6-serial

2005-09-05 00:14:47 -07:00

sh

…

sn

…

tc

…

telephony

…

usb

[PATCH] swsusp: switch pm_message_t to struct

2005-09-05 00:06:16 -07:00

video

[PATCH] swsusp: switch pm_message_t to struct

2005-09-05 00:06:16 -07:00

w1

…

zorro

…

Kconfig

…

Makefile

…