Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Jul 2011 16:26:39 +0000 (09:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Jul 2011 16:26:39 +0000 (09:26 -0700)
commit5fd00b031530cc476240f654c078c930f1dcd6ea
tree1673effc8eb32932cdcbbd211d4632a80e5693a0
parent333c066bb76f1f270ca77f16afe198e54e352c83
parent3c2c22628599006047781946b317a16d9ff3883d
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: clean up some compiler warnings
fs/jfs/namei.c