From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Jan 2008 21:51:56 +0000 (+1100)
Subject: Merge branch 'for-2.6.25' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.25-rc1~1171
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8d01eddf292dcd78b640418c80fb300532799cd4;p=linux-2.6-omap-h63xx.git

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
---

8d01eddf292dcd78b640418c80fb300532799cd4