Benjamin Herrenschmidt 6dc6472581 Merge commit 'origin' ... Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h		2008-10-15 11:31:54 +11:00
..
aoe	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2008-10-11 09:33:18 -07:00
paride
amiflop.c
ataflop.c	m68k: Remove the broken Hades support	2008-10-14 10:23:27 -07:00
brd.c	brd: fix name argument of unregister_blkdev()	2008-08-20 15:40:30 -07:00
cciss_cmd.h
cciss_scsi.c	cciss: Fix cciss SCSI rescan code to better notice device changes	2008-10-09 08:56:18 +02:00
cciss_scsi.h	cciss: Fix cciss SCSI rescan code to better notice device changes	2008-10-09 08:56:18 +02:00
cciss.c	drivers/block: Use DIV_ROUND_UP	2008-10-09 08:56:19 +02:00
cciss.h
cpqarray.c	drivers/block: Use DIV_ROUND_UP	2008-10-09 08:56:19 +02:00
cpqarray.h
cryptoloop.c
DAC960.c
DAC960.h
floppy.c	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
hd.c	hd: WIN_* -> ATA_CMD_*	2008-10-10 22:39:21 +02:00
ida_cmd.h
ida_ioctl.h
Kconfig
loop.c
Makefile
nbd.c	block: implement and use {disk|part}_to_dev()	2008-10-09 08:56:07 +02:00
pktcdvd.c	block: mark bio_split_pool static	2008-10-09 08:57:05 +02:00
ps3disk.c	block: don't depend on consecutive minor space	2008-10-09 08:56:05 +02:00
smart1,2.h
sunvdc.c	sparc64: Apply const or __initdata to vio_device_id[]	2008-09-01 01:48:52 -07:00
swim3.c
sx8.c
ub.c
umem.c
umem.h
viodasd.c	powerpc/iseries: Remove unused variable in viodasd.c	2008-10-07 14:26:19 +11:00
virtio_blk.c	virtio_blk: change to use __blk_end_request()	2008-10-09 08:56:20 +02:00
xd.c
xd.h
xen-blkfront.c	Merge branch 'linus' into x86/xen	2008-10-12 12:37:32 +02:00
xsysace.c
z2ram.c