Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
Linus Torvalds [Fri, 28 Oct 2005 19:44:24 +0000 (12:44 -0700)]
1  2 
fs/jfs/jfs_metapage.c

Simple merge