| commit | 096e5bdaf166791e128ed3b9190542412559333b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Nov 02 08:51:26 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Nov 02 08:51:26 2006 -0800 |
| tree | 3095ed989020c0533f045b796fcb5bc6e672dfc6 | |
| parent | eb193e405155c5680ca1560b040b1551566660f9 [diff] | |
| parent | 89f68225876db7df638de2884b561facb1870239 [diff] |
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