tree 1673effc8eb32932cdcbbd211d4632a80e5693a0
parent 333c066bb76f1f270ca77f16afe198e54e352c83
parent 3c2c22628599006047781946b317a16d9ff3883d
author Linus Torvalds <torvalds@linux-foundation.org> 1311783999 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311783999 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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