commit | 5ac4d630eb87656bd4dc313b910776d54d88ea28 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 16 10:34:42 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 16 10:34:42 2009 -0800 |
tree | de69640aee50ae7969dc3d5db223499e58795b47 | |
parent | 59be2e04e50ac9947e4356c10099f49977f5f74d [diff] | |
parent | b568be627a7270eba575bc4406a606e1545f91bb [diff] |
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