Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 19:44:24 +0000 (12:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 19:44:24 +0000 (12:44 -0700)
commit8caf89157d64f1eedba37113afb4b303b2b3e301
treea72038508368f81e5b3f1b82ad14918df8c7be7a
parentf12baeab9d65e2fe1b43b09b666f5efcb81b9369
parent7038f1cbac899654cf0515e60dbe3e44d58271de
Merge branch 'for-linus' of git://git./linux/kernel/git/shaggy/jfs-2.6
fs/jfs/jfs_metapage.c