You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller e548833df8 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/mac80211/main.c		15 years ago
..
Makefile	…
qlcnic.h	qlcnic: add cksum flag	15 years ago
qlcnic_ctx.c	qlcnic: fix mac override capability	15 years ago
qlcnic_ethtool.c	qlcnic: add api version in reg dump	15 years ago
qlcnic_hdr.h	qlcnic: backout firmware initialization update	15 years ago
qlcnic_hw.c	qlcnic: mac vlan learning support	15 years ago
qlcnic_init.c	drivers/net: avoid some skb->ip_summed initializations	15 years ago
qlcnic_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago