forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/drivers/net/ethernet/freescale
History
David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/net/ethernet/emulex/benet/be.h
	include/net/tcp.h
	net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-30 03:55:20 -04:00
..
fs_enet drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb 2013-03-09 16:09:19 -05:00
fec.h net: fec: Enable imx6 enet checksum acceleration. 2013-04-25 03:58:26 -04:00
fec_main.c net: fec: Enable imx6 enet checksum acceleration. 2013-04-25 03:58:26 -04:00
fec_mpc52xx.c fec: Convert printks to netdev_<level> 2013-04-14 15:41:49 -04:00
fec_mpc52xx.h
fec_mpc52xx_phy.c
fec_ptp.c fec: Convert printks to netdev_<level> 2013-04-14 15:41:49 -04:00
fsl_pq_mdio.c
gianfar.c net: Fix some __vlan_hwaccel_put_tag() callers. 2013-04-22 19:24:19 -04:00
gianfar.h gianfar: Remove superfluous kernel_dropped local counter 2013-03-21 12:01:34 -04:00
gianfar_ethtool.c net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_* 2013-04-19 14:45:26 -04:00
gianfar_ptp.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-30 03:55:20 -04:00
gianfar_sysfs.c gianfar: Use netdev_<level> when possible 2013-04-14 15:41:49 -04:00
Kconfig NET: FEC: dynamtic check DMA desc buff type 2013-01-04 15:15:39 -08:00
Makefile net: fec: build fec.c and fec_ptp.c to one module 2013-03-25 12:14:57 -04:00
ucc_geth.c ucc_geth: Convert ugeth_<level> to pr_<level> 2013-04-14 15:41:49 -04:00
ucc_geth.h
ucc_geth_ethtool.c ucc_geth: Convert ugeth_<level> to pr_<level> 2013-04-14 15:41:49 -04:00
xgmac_mdio.c