]> err.no Git - linux-2.6/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 9 Jul 2007 20:09:16 +0000 (13:09 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 9 Jul 2007 20:09:16 +0000 (13:09 -0700)
* '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


Trivial merge