Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 4 Nov 2006 16:11:20 +0000 (08:11 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 4 Nov 2006 16:11:20 +0000 (08:11 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  JFS: Remove redundant xattr permission checking


Trivial merge