Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Jun 2009 19:23:52 +0000 (12:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Jun 2009 19:23:52 +0000 (12:23 -0700)
commitcd5232bd6be2d215a800f3d88c287ca791debfbe
tree7a91e7d4bc5312cc61e7003abd383d8de1f0f9aa
parent300df7dc89cc276377fc020704e34875d5c473b6
parentf7c52fd17a7dda42fc9e88c2b2678403419bfe63
Merge branch 'for-linus' of git://git./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