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 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>		12 years ago
..
Kconfig	bfin_mac: Restore hardware time-stamping dependency on BF518	12 years ago
Makefile	…
bfin_mac.c	net: phy: remove flags argument from phy_{attach, connect, connect_direct}	12 years ago
bfin_mac.h	bfin_mac: offer a PTP Hardware Clock.	12 years ago