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

[PATCH] ARM: switch fd1772.c from sleep_on to wait_event

2005-08-07 14:23:42 +01:00

acpi

[PATCH] acpi_shutdown: Only prepare for power off on power_off

2005-08-27 10:11:40 -07:00

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

[Bluetooth]: Move packet type into the SKB control buffer

2005-08-29 15:55:13 -07:00

cdrom

[PATCH] Make MODULE_DEVICE_TABLE work for vio devices

2005-08-30 13:31:56 +10:00

char

Merge watchdog driver updates

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

cpufreq

…

crypto

…

dio

…

eisa

…

fc4

…

firmware

…

hwmon

[PATCH] I2C hwmon: kfree fixes

2005-08-26 19:37:12 -07:00

i2c

[PATCH] Build fix for the Sibyte I2C driver

2005-08-09 12:08:21 -07:00

ide

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

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

ieee1394

[NET]: Kill skb->list

2005-08-29 15:31:14 -07:00

infiniband

[PATCH] IB: move include files to include/rdma

2005-08-26 20:37:38 -07:00

input

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

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

isdn

[NET]: Remove explicit initializations of skb->input_dev

2005-08-29 15:33:26 -07:00

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

[PATCH] I2O: added pci_request_regions() before using the controller

2005-08-09 17:59:52 -07:00

mfd

[MFD] Add SA11x0 MCP platform device support

2005-08-18 10:10:46 +01:00

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

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

2005-08-29 10:34:59 -07:00

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

[PATCH] broken error path in drivers/pnp/card.c

2005-08-18 08:43:59 -07:00

s390

[PATCH] s390: disconnected 3270 console

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

sbus

[SPARC64]: Use drivers/Kconfig

2005-08-30 21:46:19 -07:00

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

[NETLINK]: Add "groups" argument to netlink_kernel_create

2005-08-29 16:01:11 -07:00

zorro

…

Kconfig

[MFD] Add multimedia communication port core support

2005-08-18 10:06:59 +01:00

Makefile

[MFD] Add multimedia communication port core support

2005-08-18 10:06:59 +01:00