Jens Axboe 698567f3fa Merge commit 'v2.6.39' into for-2.6.40/core ... Since for-2.6.40/core was forked off the 2.6.39 devel tree, we've had churn in the core area that makes it difficult to handle patches for eg cfq or blk-throttle. Instead of requiring that they be based in older versions with bugs that have been fixed later in the rc cycle, merge in 2.6.39 final. Also fixes up conflicts in the below files. Conflicts: drivers/block/paride/pcd.c drivers/cdrom/viocd.c drivers/ide/ide-cd.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>		2011-05-20 20:33:15 +02:00
..
aoe	drivers/block/aoe/Makefile: replace the use of <module>-objs with <module>-y	2011-01-19 08:25:02 -07:00
drbd	Fix common misspellings	2011-03-31 11:26:23 -03:00
paride	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
DAC960.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
DAC960.h	Fix DAC960 driver on machines which don't support 64-bit DMA	2007-09-11 17:21:19 -07:00
Kconfig	xen: separate out frontend xenbus	2011-01-05 16:29:17 -05:00
Makefile	drivers/block/Makefile: replace the use of <module>-objs with <module>-y	2011-01-19 08:25:02 -07:00
amiflop.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
ataflop.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
brd.c	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	2010-10-22 17:07:18 -07:00
cciss.c	cciss: fix missed command status value CMD_UNABORTABLE	2011-03-12 10:02:30 +01:00
cciss.h	cciss: fix lost command issue	2011-03-23 20:47:11 +01:00
cciss_cmd.h	cciss: Inform controller we are using 32-bit tags.	2011-03-12 10:02:16 +01:00
cciss_scsi.c	Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation"	2011-03-12 13:47:51 +01:00
cciss_scsi.h	cciss: remove C99-style comments	2010-02-22 13:44:45 +01:00
cpqarray.c	block: remove per-queue plugging	2011-03-10 08:52:07 +01:00
cpqarray.h	…
cryptoloop.c	drivers: Remove unnecessary inclusions of asm/semaphore.h	2008-04-18 22:16:32 -04:00
floppy.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
hd.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ida_cmd.h	…
ida_ioctl.h	…
loop.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
mg_disk.c	block: switch s390 tape_block and mg_disk to elevator_change()	2010-08-23 14:02:44 +02:00
nbd.c	nbd: remove module-level ioctl mutex	2011-02-11 16:12:20 -08:00
osdblk.c	block: remove spurious uses of REQ_HARDBARRIER	2010-09-10 12:35:36 +02:00
pktcdvd.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
ps3disk.c	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	2010-10-22 17:07:18 -07:00
ps3vram.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
rbd.c	rbd: fix split bio handling	2011-05-13 13:52:57 -07:00
rbd_types.h	rbd: introduce rados block device (rbd), based on libceph	2010-10-20 15:38:13 -07:00
smart1,2.h	fix typos 'comamnd' -> 'command' in comments	2011-02-02 11:31:21 +01:00
sunvdc.c	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
swim.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
swim3.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
swim_asm.S	m68k: mac - Add SWIM floppy support	2009-03-26 21:15:27 +01:00
sx8.c	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
ub.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
umem.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
umem.h	drivers/block/umem: trim trailing whitespace	2007-10-10 09:25:59 +02:00
viodasd.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
virtio_blk.c	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	2010-10-22 17:07:18 -07:00
xd.c	block: autoconvert trivial BKL users to private mutex	2010-10-05 15:01:10 +02:00
xd.h	[PATCH] switch xd	2008-10-21 07:48:11 -04:00
xen-blkfront.c	Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm	2011-03-15 10:59:09 -07:00
xsysace.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
z2ram.c	drivers/block/z2ram.c: correct printing of sector_t	2010-10-28 06:15:26 -06:00