diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-08 17:43:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-08 17:43:58 -0700 |
| commit | c71d9caf6cfdee56da2924a054cc84cbe91d82b6 (patch) | |
| tree | db742d26d10bc309596035fb4e912a0c6b3bd206 /kernel | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | igb: remove sysfs entry that was used to set the number of vfs (diff) | |
| download | linux-rng-c71d9caf6cfdee56da2924a054cc84cbe91d82b6.tar.xz linux-rng-c71d9caf6cfdee56da2924a054cc84cbe91d82b6.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:
igb: remove sysfs entry that was used to set the number of vfs
igbvf: add new driver to support 82576 virtual functions
drivers/net/eql.c: Fix a dev leakage.
niu: Fix unused variable warning.
r6040: set MODULE_VERSION
bnx2: Don't use reserved names
FEC driver: add missing #endif
niu: Fix error handling
mv643xx_eth: don't reset the rx coal timer on interface up
smsc911x: correct debugging message on mii read timeout
ethoc: fix library build errors
netfilter: ctnetlink: fix regression in expectation handling
netfilter: fix selection of "LED" target in netfilter
netfilter: ip6tables regression fix
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions