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
..
bfin_mac.c	net: phy: remove flags argument from phy_{attach, connect, connect_direct}	2013-01-14 15:11:50 -05:00
bfin_mac.h	bfin_mac: offer a PTP Hardware Clock.	2012-11-01 11:41:35 -04:00
Kconfig	bfin_mac: Restore hardware time-stamping dependency on BF518	2013-01-10 14:27:22 -08:00
Makefile	bfin_mac: Move the Analog Devices Inc driver	2011-08-12 12:38:13 -07:00