David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be_main.c net/core/sysctl_net_core.c net/ipv4/inet_diag.c The be_main.c conflict resolution was really tricky. The conflict hunks generated by GIT were very unhelpful, to say the least. It split functions in half and moved them around, when the real actual conflict only existed solely inside of one function, that being be_map_pci_bars(). So instead, to resolve this, I checked out be_main.c from the top of net-next, then I applied the be_main.c changes from 'net' since the last time I merged. And this worked beautifully. The inet_diag.c and sysctl_net_core.c conflicts were simple overlapping changes, and were easily to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-20 18:51:09 -04:00
..
3com	drivers/net: Use setup_timer and mod_timer	2015-02-11 19:40:12 -08:00
8390	net: 8390: axnet_cs: Use setup_timer and mod_timer	2015-03-01 13:40:23 -05:00
adaptec
adi
aeroflex	net: greth: constify of_device_id array	2015-03-17 15:00:22 -04:00
agere	et131x: use msecs_to_jiffies for conversions	2015-02-11 19:37:43 -08:00
allwinner	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
alteon	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
altera	Altera TSE: constify of_device_id array	2015-03-17 15:00:21 -04:00
amd	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
apm	drivers: net: xgene: Add second SGMII based 1G interface	2015-03-18 12:44:05 -04:00
apple	net: ethernet: apple: constify of_device_id array	2015-03-17 15:00:22 -04:00
arc
atheros	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
broadcom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
brocade	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
cadence	net/macb: Only adjust tx_clk on link change	2015-03-12 23:04:32 -04:00
calxeda	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
chelsio	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
cirrus	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
cisco	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
davicom	dm9000: Add regulator and reset support to dm9000	2015-01-15 14:08:07 -05:00
dec	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
dlink
emulex	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
faraday
freescale	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
fujitsu
hisilicon	net: hip04: add missing MODULE_LICENSE	2015-02-02 18:51:03 -08:00
hp	hp100: fix misspelling of current function in string	2014-12-09 16:18:47 -05:00
i825xx
ibm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
icplus
intel	i40e: add NVM update events to AQ clean	2015-03-19 17:52:04 -04:00
marvell	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
mellanox	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
micrel	ethernet: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
microchip
moxa	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
myricom	myri10ge: Delete an unnecessary check before the function call "kfree"	2015-02-05 00:25:10 -08:00
natsemi	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
neterion	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
nuvoton
nvidia	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
nxp
octeon	netdev: octeon_mgmt: constify of_device_id array	2015-03-17 15:00:22 -04:00
oki-semi	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
packetengines	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
pasemi	net: pasemi: Use setup_timer and mod_timer	2015-03-01 13:40:23 -05:00
qlogic	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
qualcomm	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
rdc
realtek	r8169: Fix trivial typo in rtl_check_firmware	2015-02-24 16:26:07 -05:00
renesas	sh_eth: Mitigate lost statistics updates	2015-03-04 15:40:54 -05:00
rocker	rocker: add support for phys_port_name	2015-03-18 22:30:35 -04:00
samsung	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
seeq
sfc	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
sgi
silan
sis
smsc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
stmicro	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-09 23:38:02 -04:00
sun	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
tehuti	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
ti	net: netcp: constify of_device_id array	2015-03-17 15:00:21 -04:00
tile	tile: use %*pb[l] to print bitmaps including cpumasks and nodemasks	2015-02-13 21:21:37 -08:00
toshiba	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
tundra
via	via-velocity: constify of_device_id array	2015-03-17 15:00:24 -04:00
wiznet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
xilinx	net: xilinx: constify of_device_id array	2015-03-17 15:00:22 -04:00
xircom
xscale	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
dnet.c	net: dnet: fix dnet_poll()	2015-01-11 21:44:55 -05:00
dnet.h
ec_bhf.c
ethoc.c	net: ethoc: constify of_device_id array	2015-03-17 15:00:21 -04:00
fealnx.c
jme.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
jme.h
Kconfig	net: s6gmac: remove driver	2014-12-22 16:29:03 -05:00
korina.c
lantiq_etop.c
Makefile	net: s6gmac: remove driver	2014-12-22 16:29:03 -05:00
netx-eth.c