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)
commit5ac4d630eb87656bd4dc313b910776d54d88ea28
treede69640aee50ae7969dc3d5db223499e58795b47
parent59be2e04e50ac9947e4356c10099f49977f5f74d
parentb568be627a7270eba575bc4406a606e1545f91bb
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: temporarily disable discard granularity