From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 2 Nov 2006 16:51:26 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... 
X-Git-Tag: v2.6.19-rc5~67
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=096e5bdaf166791e128ed3b9190542412559333b;p=~shefty%2Frdma-dev.git

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
---

096e5bdaf166791e128ed3b9190542412559333b