diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:34:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:34:42 -0800 |
| commit | 5ac4d630eb87656bd4dc313b910776d54d88ea28 (patch) | |
| tree | de69640aee50ae7969dc3d5db223499e58795b47 /fs/lockd | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | block: temporarily disable discard granularity (diff) | |
| download | linux-dev-5ac4d630eb87656bd4dc313b910776d54d88ea28.tar.xz linux-dev-5ac4d630eb87656bd4dc313b910776d54d88ea28.zip | |
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
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions