Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
commitaaa9b971398f62ab97c1da4f7c352667eb3452c9
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 4 Nov 2006 16:11:20 +0000 (4 08:11 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 4 Nov 2006 16:11:20 +0000 (4 08:11 -0800)
tree87f705ce9275b8c180184d29405a137c6e939af4
parenta0d2db26582a67b61f883d1469e561fbdef28419
parentd572b87946f8c598b3cad86a7913862dd48daadb
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 redundant xattr permission checking