tree 3095ed989020c0533f045b796fcb5bc6e672dfc6
parent eb193e405155c5680ca1560b040b1551566660f9
parent 89f68225876db7df638de2884b561facb1870239
author Linus Torvalds <torvalds@g5.osdl.org> 1162486286 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1162486286 -0800

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: Add splice support