| commit | cd5232bd6be2d215a800f3d88c287ca791debfbe | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 16 12:23:52 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 16 12:23:52 2009 -0700 |
| tree | 7a91e7d4bc5312cc61e7003abd383d8de1f0f9aa | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 [diff] | |
| parent | f7c52fd17a7dda42fc9e88c2b2678403419bfe63 [diff] |
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