tree c413042b19bb0302eabcbc89febe051f58186477
parent c31f2e8a42c41efa46397732656ddf48cc77593e
parent 288e4d838d1e999c0515f85a337cacb2be233071
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1184011756 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184011756 -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: Update print_hex_dump() syntax
  JFS: use print_hex_dump() rather than private dump_mem() function
  JFS: Whitespace cleanup and remove some dead code