diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-26 17:14:02 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-26 17:14:02 (GMT) |
commit | c5e6fd28e5776200a737e9df337a529d36fa9a54 (patch) | |
tree | df9f926123dd9cbaa9e57f13cc44200c50ee5cbc /include/asm-mips/setup.h | |
parent | b3733034f113a4119f734b84e94180a42c8bc1a1 (diff) | |
parent | 289c79a4bd350e8a25065102563ad1a183d1b402 (diff) | |
download | linux-fsl-qoriq-c5e6fd28e5776200a737e9df337a529d36fa9a54.tar.xz |
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: (52 commits)
vlan: Use bitmask of feature flags instead of seperate feature bits
fmvj18x_cs: add NextCom NC5310 rev B support
xirc2ps_cs: re-initialize the multicast address in do_reset
3C509: rx_bytes should not be increased when alloc_skb failed
NETFRONT: Use __skb_queue_purge()
VIRTIO: Use __skb_queue_purge()
phylib: do EXPORT_SYMBOL on get_phy_id
netlink: Fix nla_parse_nested_compat() to call nla_parse() directly
WAN: protect HDLC proto list while insmod/rmmod
drivers/net/fs_enet: remove null pointer dereference
S2io: Version update for napi and MSI-X patches
S2io: Added napi support when MSIX is enabled.
S2io: Move all the transmit completions to a single msi-x (alarm) vector
drivers/net/ehea - remove unnecessary memset after kzalloc
au1000_eth: remove useless check
Blackfin EMAC Driver: Removed duplicated include <linux/ethtool.h>
cpmac bugfixes and enhancements
e1000e: use resource_size_t, not unsigned long, for phys addrs
net/usb: add support for Apple USB Ethernet Adapter
uli526x: add support for netpoll
...
Diffstat (limited to 'include/asm-mips/setup.h')
0 files changed, 0 insertions, 0 deletions