5f74d
parent b568be627a7270eba575bc4406a606e1545f91bb
author Linus Torvalds <torvalds@linux-foundation.org> 1260988482 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260988482 -0800

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
LX’