David S. Miller 6bc19fb82d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Merge 'net' bug fixes into 'net-next' as we have patches that will build on top of them. This merge commit includes a change from Emil Goode (emilgoode@gmail.com) that fixes a warning that would have been introduced by this merge. Specifically it fixes the pingv6_ops method ipv6_chk_addr() to add a "const" to the "struct net_device *dev" argument and likewise update the dummy_ipv6_chk_addr() declaration. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-06-05 16:37:30 -07:00
..
netxen	net: ethernet: replace strict_strtoul() with kstrtoul()	2013-06-03 00:39:46 -07:00
qlcnic	net: ethernet: replace strict_strtoul() with kstrtoul()	2013-06-03 00:39:46 -07:00
qlge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-06-05 16:37:30 -07:00
Kconfig	qlcnic: Support SR-IOV enable and disable	2013-03-29 15:46:08 -04:00
Makefile
qla3xxx.c	drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb	2013-03-09 16:09:19 -05:00
qla3xxx.h