| commit | 8d01eddf292dcd78b640418c80fb300532799cd4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 29 08:51:56 2008 +1100 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 29 08:51:56 2008 +1100 |
| tree | dd7f816423463e5ad10f15af22fdbd5b75cc6184 | |
| parent | f0f0052069989b80d2a3e50c9cd2f2a650bc1aea [diff] | |
| parent | fa0ccd837e3dddb44c7db2f128a8bb7e4eabc21a [diff] |
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