From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Feb 2009 03:19:50 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=86adf8adfcb3d3f4b6c30aeb40da480da02de1d1;p=linux-2.6-omap-h63xx.git

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

86adf8adfcb3d3f4b6c30aeb40da480da02de1d1