diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-02 17:51:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-02 17:51:26 +0100 |
| commit | 096e5bdaf166791e128ed3b9190542412559333b (patch) | |
| tree | 3095ed989020c0533f045b796fcb5bc6e672dfc6 /include | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | jfs: Add splice support (diff) | |
| download | linux-096e5bdaf166791e128ed3b9190542412559333b.tar.xz linux-096e5bdaf166791e128ed3b9190542412559333b.zip | |
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions