summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 19:34:42 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 19:34:42 +0100
commit5ac4d630eb87656bd4dc313b910776d54d88ea28 (patch)
treede69640aee50ae7969dc3d5db223499e58795b47 /arch/ia64
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentblock: temporarily disable discard granularity (diff)
downloadlinux-5ac4d630eb87656bd4dc313b910776d54d88ea28.tar.xz
linux-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 'arch/ia64')
0 files changed, 0 insertions, 0 deletions