David Howells 4796b71fbb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	drivers/pcmcia/ds.c

Fix up merge failures with Linus's head and fix new compile failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

2006-12-06 15:01:18 +00:00

..

acorn

…

acpi

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 17:01:28 +00:00

amba

…

ata

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-06 15:01:18 +00:00

atm

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

base

[PATCH] severing module.h->sched.h

2006-12-04 02:00:22 -05:00

block

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 17:01:28 +00:00

bluetooth

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-06 15:01:18 +00:00

cdrom

[PATCH] block: support larger block pc requests

2006-12-01 10:40:55 +01:00

char

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-06 15:01:18 +00:00

clocksource

[PATCH] clocksource: acpi_pm: add another greylist chipset

2006-10-21 13:35:05 -07:00

connector

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

cpufreq

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

crypto

…

dio

…

dma

…

edac

[PATCH] edac_mc: fix error handling

2006-11-03 12:27:57 -08:00

eisa

…

fc4

[SCSI] fc4: Conversion to struct scsi_cmnd in fc4

2006-10-25 15:12:45 -07:00

firmware

[PATCH] dell_rbu: fix error check

2006-11-16 11:43:38 -08:00

hwmon

[PATCH] severing fs.h, radix-tree.h -> sched.h

2006-12-04 02:00:24 -05:00

i2c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

ide

Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2006-12-05 15:52:06 -08:00

ieee1394

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

infiniband

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 17:01:28 +00:00

input

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

isdn

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-06 15:01:18 +00:00

leds

[PATCH] severing module.h->sched.h

2006-12-04 02:00:22 -05:00

macintosh

WorkQueue: Fix up arch-specific work items where possible

2006-12-05 19:36:26 +00:00

mca

…

md

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

media

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 17:01:28 +00:00

message

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

mfd

…

misc

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

mmc

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

mtd

Fix typos in doc and comments

2006-11-30 05:32:19 +01:00

net

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-06 15:01:18 +00:00

nubus

…

oprofile

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

parisc

Fix misc .c/.h comment typos

2006-11-30 05:24:39 +01:00

parport

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

pci

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 17:01:28 +00:00

pcmcia

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-06 15:01:18 +00:00

pnp

…

ps3

[POWERPC] ps3: multiplatform build fixes

2006-12-04 20:41:16 +11:00

rapidio

…

rtc

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

s390

[S390] cio: Use device_reprobe() instead of bus_rescan_devices().

2006-12-04 15:41:07 +01:00

sbus

[SPARC]: Fix bus_id[] string overflow.

2006-10-27 01:03:31 -07:00

scsi

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-06 15:01:18 +00:00

serial

Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2006-12-05 15:52:06 -08:00

sh

…

sn

…

spi

WorkQueue: Fix up arch-specific work items where possible

2006-12-05 19:36:26 +00:00

tc

…

telephony

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

usb

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-06 15:01:18 +00:00

video

WorkQueue: Fix up arch-specific work items where possible

2006-12-05 19:36:26 +00:00

w1

[PATCH] severing module.h->sched.h

2006-12-04 02:00:22 -05:00

zorro

…

Kconfig

…

Makefile

[POWERPC] ps3: Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3

2006-12-04 20:41:14 +11:00