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
..
aoe	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
paride	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
acsi_slm.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
acsi.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
amiflop.c	[PATCH] amiga_floppy_init() in non-modular case	2006-10-11 11:17:07 -07:00
ataflop.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
cciss_cmd.h	[PATCH] cciss: support for >2TB logical volumes	2006-10-01 00:39:20 -07:00
cciss_scsi.c	[PATCH] completions: lockdep annotate on stack completions	2006-10-01 00:39:24 -07:00
cciss_scsi.h
cciss.c	[PATCH] cciss: fix iostat	2006-11-14 15:08:50 -08:00
cciss.h	[PATCH] cciss: support for >2TB logical volumes	2006-10-01 00:39:20 -07:00
cpqarray.c	[PATCH] cpqarray: fix iostat	2006-11-14 15:08:50 -08:00
cpqarray.h
cryptoloop.c
DAC960.c	Various drivers' irq handlers: kill dead code, needless casts	2006-10-06 15:00:58 -04:00
DAC960.h	[PATCH] DAC960: use memmove for overlapping areas	2006-10-11 11:14:23 -07:00
floppy.c	WorkStruct: Pass the work_struct pointer instead of context data	2006-11-22 14:55:48 +00:00
ida_cmd.h
ida_ioctl.h
Kconfig	Fix bytes <-> kilobytes typo in Kconfig for ramdisk	2006-10-03 23:40:34 +02:00
loop.c	[PATCH] __user annotations: loop.c	2006-10-10 15:37:23 -07:00
Makefile
nbd.c
pktcdvd.c	[PATCH] pktcdvd: rename a variable for better readability	2006-10-04 07:55:14 -07:00
ps2esdi.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
rd.c	[PATCH] rd: memory leak on rd_init() failure	2006-10-17 08:18:48 -07:00
smart1,2.h
swim3.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
swim_iop.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
sx8.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
ub.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
umem.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
viodasd.c	[POWERPC] iSeries: improve viodasd initialisation	2006-12-04 20:39:10 +11:00
xd.c	[PATCH] Use linux/io.h instead of asm/io.h	2006-10-11 11:14:23 -07:00
xd.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
z2ram.c	[PATCH] z2_init() in non-modular case	2006-10-11 11:17:07 -07:00