]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb193e4 89f6822)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Nov 2006 16:51:26 +0000 (08:51 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Nov 2006 16:51:26 +0000 (08:51 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  jfs: Add splice support


Trivial merge
Linux 2.6 source tree