From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Jul 2008 18:03:19 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... 
X-Git-Tag: v2.6.27-rc1~1079
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4e0fadcd929138aa82130a1c5f22206d86d7bb2;p=linux-2.6

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

e4e0fadcd929138aa82130a1c5f22206d86d7bb2