Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
commit67e3812426efbe62dd765eed9895cd3098def948
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 May 2006 15:37:03 +0000 (24 08:37 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 May 2006 15:37:03 +0000 (24 08:37 -0700)
treeb38073c956ed46cc1d5953abd34beb669e3f8b8a
parent278654541017bc93befe3570edeabd5d9e95e4ea
parentb964638ffd59b61c13f02b81e5118a6e573d91cd
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 multiple errors in metapage_releasepage