Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
commit096e5bdaf166791e128ed3b9190542412559333b
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Nov 2006 16:51:26 +0000 (2 08:51 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Nov 2006 16:51:26 +0000 (2 08:51 -0800)
tree3095ed989020c0533f045b796fcb5bc6e672dfc6
parenteb193e405155c5680ca1560b040b1551566660f9
parent89f68225876db7df638de2884b561facb1870239
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: Add splice support