From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 20 Mar 2006 18:32:33 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... 
X-Git-Tag: v2.6.17-rc1~1185
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88dcb91177cfa5b26143a29074389a2aa259c7cf;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: add uid, gid, and umask mount options
  JFS: Take logsync lock before testing mp->lsn
  JFS: kzalloc conversion
  JFS: Add missing file from fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6
  JFS: Use the kthread_ API
  JFS: Fix regression.  fsck complains if symlinks do not have INLINEEA attribute
  JFS: ext2 inode attributes for jfs
  JFS: semaphore to mutex conversion.
  JFS: make buddy table static
  JFS: Add back directory i_size calculations for legacy partitions
---

88dcb91177cfa5b26143a29074389a2aa259c7cf