summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 12:23:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 12:23:52 -0700
commitcd5232bd6be2d215a800f3d88c287ca791debfbe (patch)
tree7a91e7d4bc5312cc61e7003abd383d8de1f0f9aa /lib
parent300df7dc89cc276377fc020704e34875d5c473b6 (diff)
parentf7c52fd17a7dda42fc9e88c2b2678403419bfe63 (diff)
downloadlinux-3.10-cd5232bd6be2d215a800f3d88c287ca791debfbe.tar.gz
linux-3.10-cd5232bd6be2d215a800f3d88c287ca791debfbe.tar.bz2
linux-3.10-cd5232bd6be2d215a800f3d88c287ca791debfbe.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: fix regression preventing coalescing of extents
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions