Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 23 Oct 2006 15:25:00 +0000 (08:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 23 Oct 2006 15:25:00 +0000 (08:25 -0700)
commit73441c665bee555526b1cf3eef603a0cff0b7e19
treedcf491e57d8b150527d09503182fd2aa398fd733
parentd5a92dd43739f59f77247cfbcbefd229e2948131
parent8f6cff98477edbcd8ae4976734ba7edd07bdd244
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: pageno needs to be long