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

..

forcedeth.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-01-15 15:05:59 -05:00

Kconfig

drivers/net/ethernet/*: Enabled vendor Kconfig options

2011-08-27 00:58:56 -07:00

Makefile

…