]> www.infradead.org Git - users/hch/uuid.git/commitdiff
projects / users / hch / uuid.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be3478d 05ec9e2)
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)
* '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

1  2 
fs/jfs/jfs_logmgr.c patch | diff1 | diff2 | blob | history
fs/jfs/jfs_txnmgr.c patch | diff1 | diff2 | blob | history

diff --cc fs/jfs/jfs_logmgr.c
Simple merge
diff --cc fs/jfs/jfs_txnmgr.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.