Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 May 2007 18:32:30 +0000 (11:32 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 May 2007 18:32:30 +0000 (11:32 -0700)
commit18062a91d2ddc40e19fc674afeb7cad58cfa23ab
tree886fe7ec99623767e38ff7fc67a078918338bb3e
parentbe3478ddb8a3902b588c840b42e166a0e64a87b3
parent05ec9e26be1f668ccba4ca54d9a4966c6208c611
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 race waking up jfsIO kernel thread
  JFS: use __set_current_state()
  Copy i_flags to jfs inode flags on write
  JFS: document uid, gid, and umask mount options in jfs.txt
fs/jfs/jfs_logmgr.c
fs/jfs/jfs_txnmgr.c