OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/drivers/net/ethernet/qlogic/qlcnic
History
David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2013-01-15 15:05:59 -05:00
..
Makefile qlcnic: 83xx register dump routines 2013-01-02 02:43:27 -08:00
qlcnic.h qlcnic: update driver version 2013-01-02 02:43:28 -08:00
qlcnic_83xx_hw.c qlcnic: 83xx ethtool interface routines 2013-01-02 02:43:27 -08:00
qlcnic_83xx_hw.h qlcnic: 83xx ethtool interface routines 2013-01-02 02:43:27 -08:00
qlcnic_83xx_init.c qlcnic: 83xx register dump routines 2013-01-02 02:43:27 -08:00
qlcnic_83xx_vnic.c qlcnic: enable 83xx virtual NIC mode 2013-01-02 02:43:27 -08:00
qlcnic_ctx.c qlcnic: 83xx register dump routines 2013-01-02 02:43:27 -08:00
qlcnic_ethtool.c qlcnic: remove unused definitions from header file 2013-01-02 02:43:28 -08:00
qlcnic_hdr.h qlcnic: remove unused definitions from header file 2013-01-02 02:43:28 -08:00
qlcnic_hw.c qlcnic: 83xx ethtool interface routines 2013-01-02 02:43:27 -08:00
qlcnic_hw.h qlcnic: 83xx memory map and HW access routines 2013-01-02 02:43:26 -08:00
qlcnic_init.c qlcnic: 83xx data path routines 2013-01-02 02:43:26 -08:00
qlcnic_io.c qlcnic: 83xx data path routines 2013-01-02 02:43:26 -08:00
qlcnic_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-01-15 15:05:59 -05:00
qlcnic_minidump.c qlcnic: 83xx register dump routines 2013-01-02 02:43:27 -08:00
qlcnic_sysfs.c qlcnic: 83xx sysfs routines 2013-01-02 02:43:27 -08:00