Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Feb 2009 03:19:50 +0000 (19:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Feb 2009 03:19:50 +0000 (19:19 -0800)
* '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()


Trivial merge