summaryrefslogtreecommitdiff
path: root/arch/parisc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 10:34:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 10:34:42 -0800
commit5ac4d630eb87656bd4dc313b910776d54d88ea28 (patch)
treede69640aee50ae7969dc3d5db223499e58795b47 /arch/parisc
parent59be2e04e50ac9947e4356c10099f49977f5f74d (diff)
parentb568be627a7270eba575bc4406a606e1545f91bb (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
Diffstat (limited to 'arch/parisc')
0 files changed, 0 insertions, 0 deletions