diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 20:40:34 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 20:40:34 +0200 |
commit | 589acce53e235055806e81e330af1e8f115bfcc2 (patch) | |
tree | 3a525461f60d5449eb6b95f03e3a7c3f1c25a77b /arch/sparc/include/asm/vac-ops.h | |
parent | Fix RTC wakealarm sysfs interface breakage. (diff) | |
parent | smc911x: Fix external PHY detection (diff) | |
download | linux-589acce53e235055806e81e330af1e8f115bfcc2.tar.xz linux-589acce53e235055806e81e330af1e8f115bfcc2.zip |
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.
Diffstat (limited to 'arch/sparc/include/asm/vac-ops.h')
0 files changed, 0 insertions, 0 deletions