Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 18:34:42 +0000 (10:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 18:34:42 +0000 (10:34 -0800)
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: temporarily disable discard granularity


Trivial merge