Merge branch 'for-2.6.25' of git://git.kernel.dk/linux-2.6-block
commit8d01eddf292dcd78b640418c80fb300532799cd4
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jan 2008 21:51:56 +0000 (29 08:51 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jan 2008 21:51:56 +0000 (29 08:51 +1100)
treedd7f816423463e5ad10f15af22fdbd5b75cc6184
parentf0f0052069989b80d2a3e50c9cd2f2a650bc1aea
parentfa0ccd837e3dddb44c7db2f128a8bb7e4eabc21a
Merge branch 'for-2.6.25' of git://git.kernel.dk/linux-2.6-block

* '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
block/ll_rw_blk.c
include/linux/blkdev.h