commit | b8bba261e05bce1712231060f296001ddf8250ab | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Wed May 24 08:36:03 2006 -0700 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed May 24 08:36:03 2006 -0700 |
tree | e7d6ae6e4f3c7fe48d3cbc5dfb83abb5826dfb9a | |
parent | 51c403274093767d6dc30703d67e9f0b255c7439 [diff] | |
parent | a1433ac4ab46fb23ae77804c207a1f710a7b12f1 [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