David S. Miller 394efd19d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/netconsole.c net/bridge/br_private.h Three mostly trivial conflicts. The net/bridge/br_private.h conflict was a function signature (argument addition) change overlapping with the extern removals from Joe Perches. In drivers/net/netconsole.c we had one change adjusting a printk message whilst another changed "printk(KERN_INFO" into "pr_info(". Lastly, the emulex change was a new inline function addition overlapping with Joe Perches's extern removals. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-11-04 13:48:30 -05:00
..
adapter.h
ael1002.c
aq100x.c
common.h	ethernet: Convert dev_printk(KERN_<LEVEL> to dev_<level>(	2012-10-31 14:02:45 -04:00
cxgb3_ctl_defs.h
cxgb3_defs.h
cxgb3_ioctl.h
cxgb3_main.c	net: cxgb3: remove unnecessary pci_set_drvdata()	2013-10-18 00:03:30 -04:00
cxgb3_offload.c	treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks	2013-08-20 13:06:40 +02:00
cxgb3_offload.h
firmware_exports.h
l2t.c	cxgb3: Convert t3_l2t_get() over to dst_neigh_lookup().	2012-07-05 02:29:40 -07:00
l2t.h	cxgb3: Convert t3_l2t_get() over to dst_neigh_lookup().	2012-07-05 02:29:40 -07:00
Makefile
mc5.c
regs.h	chelsio: remove duplicate defines	2013-10-21 18:46:45 -04:00
sge_defs.h
sge.c	cxgb3: Fix length calculation in write_ofld_wr() on 32-bit architectures	2013-10-29 00:14:03 -04:00
t3_cpl.h
t3_hw.c	remove init of dev->perm_addr in drivers	2013-01-08 18:00:48 -08:00
t3cdev.h
version.h	cxgb3: update firmware version	2012-02-15 15:48:19 -05:00
vsc8211.c
xgmac.c