Linus Torvalds 45bfe98bd7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge ... Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's gone, gone, gone). Signed-off-by: Linus Torvalds <torvalds@osdl.org>		2006-01-12 10:21:22 -08:00
..
aoe	[PATCH] Add block_device_operations.getgeo block device method	2006-01-08 20:13:54 -08:00
paride	[PATCH] Add block_device_operations.getgeo block device method	2006-01-08 20:13:54 -08:00
acsi_slm.c
acsi.c	[PATCH] Add block_device_operations.getgeo block device method	2006-01-08 20:13:54 -08:00
amiflop.c	[PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers	2006-01-12 09:09:05 -08:00
ataflop.c	[PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers	2006-01-12 09:09:05 -08:00
cciss_cmd.h
cciss_scsi.c	[PATCH] cciss: adds MSI and MSI-X support	2006-01-08 20:14:00 -08:00
cciss_scsi.h
cciss.c	[PATCH] drivers/block: Replace pci_module_init() with pci_register_driver()	2006-01-09 12:13:22 -08:00
cciss.h	[PATCH] cciss: avoid defining useless MAJOR_NR macro	2006-01-08 20:14:09 -08:00
cpqarray.c	[PATCH] drivers/block: Use ARRAY_SIZE macro	2006-01-08 20:14:08 -08:00
cpqarray.h
cryptoloop.c
DAC960.c	[PATCH] drivers/block: Replace pci_module_init() with pci_register_driver()	2006-01-09 12:13:22 -08:00
DAC960.h
floppy.c	[PATCH] drivers/block: Use ARRAY_SIZE macro	2006-01-08 20:14:08 -08:00
ida_cmd.h
ida_ioctl.h
Kconfig
loop.c	[PATCH] mutex subsystem, semaphore to completion: drivers/block/loop.c	2006-01-09 15:59:27 -08:00
Makefile
nbd.c	[PATCH] nbd: remove duplicate assignment	2006-01-08 20:13:54 -08:00
pktcdvd.c	[PATCH] pktcdvd: Use bd_claim to get exclusive access	2006-01-08 20:13:48 -08:00
ps2esdi.c	[PATCH] Add block_device_operations.getgeo block device method	2006-01-08 20:13:54 -08:00
rd.c
smart1,2.h
swim3.c	[PATCH] powerpc: Remove device_node addrs/n_addr	2006-01-09 14:53:55 +11:00
swim_iop.c
sx8.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6	2006-01-09 18:41:42 -08:00
ub.c
umem.c	[PATCH] drivers/block: Replace pci_module_init() with pci_register_driver()	2006-01-09 12:13:22 -08:00
viodasd.c	[PATCH] powerpc: remove bitfields from HvLpEvent	2006-01-12 20:09:29 +11:00
xd.c	[PATCH] drivers/block: Use ARRAY_SIZE macro	2006-01-08 20:14:08 -08:00
xd.h
z2ram.c