Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Jul 2008 18:03:19 +0000 (11:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Jul 2008 18:03:19 +0000 (11:03 -0700)
commite4e0fadcd929138aa82130a1c5f22206d86d7bb2
treebda4637fba45a2dd1dd02f01076d4705a4a208a3
parent14351760e314b8a9720804b11c6bd11d0c0b1258
parentec1aef33668448718fcba79e4e981592bfd7e0a3
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: remove DIRENTSIZ
  JFS: diAlloc() should return -EIO rather than EIO
  JFS: skip bad iput() call in error path
  JFS: switch to seq_files
  JFS: 0 is not valid errno value so return NULL from jfs_lookup