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

Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

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

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

..

acorn

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

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

[PATCH] 64bit resource: fix up printks for resources in misc drivers

2006-06-27 09:23:59 -07:00

ata

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

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

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +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-05 17:01:28 +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

[CRYPTO] padlock: Convert padlock-sha to use crypto_hash

2006-09-21 11:46:22 +10:00

dio

…

dma

[PATCH] drivers/dma trivial annotations

2006-10-10 15:37:21 -07:00

edac

[PATCH] edac_mc: fix error handling

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

eisa

[PATCH] EISA: handle sysfs errors

2006-10-11 11:14:25 -07:00

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 branch 'linux-2.6' into for-linus

2006-12-04 15:59:07 +11: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-05 17:01:28 +00:00

leds

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

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

macintosh

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

mca

[PATCH] drivers/mca: handle sysfs errors

2006-10-11 11:14:25 -07:00

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

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

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-05 17:01:28 +00:00

nubus

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

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] parport: fix compilation failure

2006-11-16 11:43:37 -08: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-05 14:37:56 +00:00

pnp

Fix DMA resource allocation in ACPIPnP

2006-10-18 11:36:11 -07:00

ps3

[POWERPC] ps3: multiplatform build fixes

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

rapidio

Fix several typos in drivers/

2006-10-03 22:31:37 +02:00

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-05 17:01:28 +00:00

serial

[POWERPC] Add of_platform_bus support to mpc52xx psc uart driver

2006-12-05 09:53:07 +11:00

sh

…

sn

[PATCH] ioc4: Enable build on non-SN2

2006-10-17 08:18:42 -07:00

spi

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

tc

[MIPS] Fix DECserial build error by IRQ hander change

2006-10-08 02:38:28 +01:00

telephony

[PATCH] drivers/telephony/ixj: fix an array overrun

2006-11-08 18:29:23 -08:00

usb

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

video

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

w1

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

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

zorro

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

Kconfig

[PATCH] ioc4: Enable build on non-SN2

2006-10-17 08:18:42 -07:00

Makefile

[POWERPC] ps3: Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3

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