aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-24 11:36:03 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-24 11:36:03 -0400
commitb8bba261e05bce1712231060f296001ddf8250ab (patch)
treee7d6ae6e4f3c7fe48d3cbc5dfb83abb5826dfb9a /net
parent51c403274093767d6dc30703d67e9f0b255c7439 (diff)
parenta1433ac4ab46fb23ae77804c207a1f710a7b12f1 (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] sky2: fix jumbo packet support
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions