]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'for-2.6.25' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jan 2008 21:51:56 +0000 (08:51 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jan 2008 21:51:56 +0000 (08:51 +1100)
* 'for-2.6.25' of git://git.kernel.dk/linux-2.6-block:
  block: implement drain buffers
  __bio_clone: don't calculate hw/phys segment counts
  block: allow queue dma_alignment of zero
  blktrace: Add blktrace ioctls to SCSI generic devices

1  2 
block/ll_rw_blk.c
include/linux/blkdev.h

Simple merge
Simple merge