| commit | 589acce53e235055806e81e330af1e8f115bfcc2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Oct 12 11:40:34 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Oct 12 11:40:34 2008 -0700 |
| tree | 3a525461f60d5449eb6b95f03e3a7c3f1c25a77b | |
| parent | 1efd325fbadc02c1338e0ef676f0a6669b251c7a [diff] | |
| parent | f3073ac76755abd63b1d4c3d145f4c15b65b5355 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: smc911x: Fix external PHY detection e1000: allow VLAN devices to use TSO and CSUM offload gre: Initialise rtnl_link tunnel parameters properly ipvs: Add proper dependencies on IP_VS, and fix description header line.