diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 17:27:39 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 17:27:39 (GMT) |
commit | f49809fe9b39e22b0f6f75c86295ce216ce3e374 (patch) | |
tree | 05f8c05ee71307c9ab02663cfaa5f08a21c6629f /net/xfrm | |
parent | cdbbde14cb55dd10771ce79154f787322d88411b (diff) | |
parent | c1ef1f351db70ad60c793b8218dd9f6739cfd66d (diff) | |
download | linux-f49809fe9b39e22b0f6f75c86295ce216ce3e374.tar.xz |
Automatic merge of 'for-linus' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions