1
0
Files
linux/drivers/char
Linus Torvalds c9059598ea Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block: (153 commits)
  block: add request clone interface (v2)
  floppy: fix hibernation
  ramdisk: remove long-deprecated "ramdisk=" boot-time parameter
  fs/bio.c: add missing __user annotation
  block: prevent possible io_context->refcount overflow
  Add serial number support for virtio_blk, V4a
  block: Add missing bounce_pfn stacking and fix comments
  Revert "block: Fix bounce limit setting in DM"
  cciss: decode unit attention in SCSI error handling code
  cciss: Remove no longer needed sendcmd reject processing code
  cciss: change SCSI error handling routines to work with interrupts enabled.
  cciss: separate error processing and command retrying code in sendcmd_withirq_core()
  cciss: factor out fix target status processing code from sendcmd functions
  cciss: simplify interface of sendcmd() and sendcmd_withirq()
  cciss: factor out core of sendcmd_withirq() for use by SCSI error handling code
  cciss: Use schedule_timeout_uninterruptible in SCSI error handling code
  block: needs to set the residual length of a bidi request
  Revert "block: implement blkdev_readpages"
  block: Fix bounce limit setting in DM
  Removed reference to non-existing file Documentation/PCI/PCI-DMA-mapping.txt
  ...

Manually fix conflicts with tracing updates in:
	block/blk-sysfs.c
	drivers/ide/ide-atapi.c
	drivers/ide/ide-cd.c
	drivers/ide/ide-floppy.c
	drivers/ide/ide-tape.c
	include/trace/events/block.h
	kernel/trace/blktrace.c
2009-06-11 11:10:35 -07:00
..
2009-06-11 08:51:01 -07:00
2009-05-22 07:30:41 -07:00
2009-05-20 08:30:05 +10:00
2008-12-13 11:25:49 -08:00
2009-06-11 08:51:01 -07:00
2008-10-20 08:52:41 -07:00
2008-12-13 09:12:07 +00:00
2009-06-11 08:51:01 -07:00
2009-04-07 08:31:03 -07:00
2008-12-03 21:04:09 +11:00
2009-01-02 10:28:32 -08:00
2009-06-11 08:51:09 -07:00
2009-06-11 08:51:01 -07:00
2009-01-02 10:19:40 -08:00
2009-01-02 10:19:40 -08:00
2009-06-11 08:51:01 -07:00
2009-06-11 08:50:58 -07:00
2009-01-08 16:44:03 -07:00
2009-02-22 09:23:02 -08:00
2009-06-11 08:51:01 -07:00
2009-01-02 10:19:40 -08:00
2009-03-16 08:34:35 -06:00
2009-05-15 07:56:24 -05:00
2009-06-11 08:51:02 -07:00
2009-06-11 08:51:01 -07:00
2009-06-11 08:51:01 -07:00
2009-06-11 08:51:07 -07:00
2008-10-16 16:52:05 +02:00
2009-04-19 10:51:40 -07:00