tree dd7f816423463e5ad10f15af22fdbd5b75cc6184
parent f0f0052069989b80d2a3e50c9cd2f2a650bc1aea
parent fa0ccd837e3dddb44c7db2f128a8bb7e4eabc21a
author Linus Torvalds <torvalds@linux-foundation.org> 1201557116 +1100
committer Linus Torvalds <torvalds@linux-foundation.org> 1201557116 +1100

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