kernel-fxtec-pro1x/drivers/block
David S. Miller 9cbc1cb8cd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c
2009-06-15 03:02:23 -07:00
..
aoe aoe: Remove superfluous clearing of skb fields in new_skb(). 2009-05-27 17:09:44 -07:00
paride block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
amiflop.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
ataflop.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
brd.c ramdisk: remove long-deprecated "ramdisk=" boot-time parameter 2009-06-10 23:07:15 +02:00
cciss.c cciss: Remove no longer needed sendcmd reject processing code 2009-06-09 05:47:43 +02:00
cciss.h cciss: Remove no longer needed sendcmd reject processing code 2009-06-09 05:47:43 +02:00
cciss_cmd.h cciss: simplify interface of sendcmd() and sendcmd_withirq() 2009-06-09 05:47:42 +02:00
cciss_scsi.c cciss: decode unit attention in SCSI error handling code 2009-06-09 05:47:44 +02:00
cciss_scsi.h cciss: Fix cciss SCSI rescan code to better notice device changes 2008-10-09 08:56:18 +02:00
cpqarray.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
cpqarray.h
cryptoloop.c drivers: Remove unnecessary inclusions of asm/semaphore.h 2008-04-18 22:16:32 -04:00
DAC960.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
DAC960.h
floppy.c floppy: fix hibernation 2009-06-10 23:07:16 +02:00
hd.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
ida_cmd.h
ida_ioctl.h
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-06-14 13:46:25 -07:00
loop.c splice: implement default splice_read method 2009-05-11 14:13:10 +02:00
Makefile mflash: initial support 2009-04-07 08:12:38 +02:00
mg_disk.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
nbd.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
pktcdvd.c block: Use accessor functions for queue limits 2009-05-22 23:22:54 +02:00
ps3disk.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
ps3vram.c proc 2/2: remove struct proc_dir_entry::owner 2009-03-31 01:14:44 +04:00
smart1,2.h
sunvdc.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
swim.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
swim3.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
swim_asm.S m68k: mac - Add SWIM floppy support 2009-03-26 21:15:27 +01:00
sx8.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
ub.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
umem.c umem: fix request_queue lock warning 2009-04-24 08:54:21 +02:00
umem.h
viodasd.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
virtio_blk.c virtio_blk: add missing __dev{init,exit} markings 2009-06-12 22:16:39 +09:30
xd.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
xd.h [PATCH] switch xd 2008-10-21 07:48:11 -04:00
xen-blkfront.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
xsysace.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
z2ram.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00