| commit | 86adf8adfcb3d3f4b6c30aeb40da480da02de1d1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 02 19:19:50 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 02 19:19:50 2009 -0800 |
| tree | 87800568dc48006f3418689e4d23578f5c1d79b7 | |
| parent | 3fff0179e33cd7d0a688dab65700c46ad089e934 [diff] | |
| parent | cbb5901b904e122139e97c6f4caed9b1f13c3455 [diff] |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: add text file detailing queue/ sysfs files bio.h: If they MUST be inlined, then use __always_inline Fix misleading comment in bio.h block: fix inconsistent parenthesisation of QUEUE_FLAG_DEFAULT block: fix oops in blk_queue_io_stat()