| commit | b8bba261e05bce1712231060f296001ddf8250ab | |
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Wed, 24 May 2006 15:36:03 +0000 (24 08:36 -0700) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Wed, 24 May 2006 15:36:03 +0000 (24 08:36 -0700) | ||
| tree | e7d6ae6e4f3c7fe48d3cbc5dfb83abb5826dfb9a | treesnapshot (tar.gz zip) |
| parent | 51c403274093767d6dc30703d67e9f0b255c7439 | commitdiff |
| parent | a1433ac4ab46fb23ae77804c207a1f710a7b12f1 | commitdiff |
Merge branch 'upstream-linus' of /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
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
[PATCH] sky2: fix jumbo packet support