David S. Miller b26e478f8f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/freescale/fsl_pq_mdio.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

2011-12-16 02:11:14 -05:00

..

appletalk

…

arcnet

net: Revert ARCNET and PHYLIB to tristate options

2011-11-26 14:36:49 -05:00

bonding

net: introduce vlan_vid_[add/del] and use them instead of direct [add/kill]_vid ndo calls

2011-12-08 19:52:42 -05:00

caif

caif: Replace BUG_ON with WARN_ON.

2011-12-06 17:21:47 -05:00

can

can: cc770: add platform bus driver for the CC770 and AN82527

2011-12-01 13:09:31 -05:00

cris

…

dsa

dsa: Move switch drivers to new directory drivers/net/dsa

2011-11-29 00:21:36 -05:00

ethernet

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-16 02:11:14 -05:00

fddi

skfp: Fix SysKonnect FDDI driver compile issues

2011-08-27 00:58:23 -07:00

hamradio

…

hippi

net: drivers/net/hippi/Kconfig should be sourced

2011-11-09 15:55:06 -05:00

irda

net/irda: convert drivers/net/irda/* to use module_platform_driver()

2011-11-27 20:29:11 -05:00

phy

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-11-26 14:47:03 -05:00

plip

plip: Move the PLIP driver

2011-08-27 00:58:33 -07:00

ppp

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-16 02:11:14 -05:00

slip

slip: Move the SLIP drivers

2011-08-27 00:58:36 -07:00

team

team: use vlan_vids_[addr/del]_by_dev

2011-12-08 19:52:43 -05:00

tokenring

drivers/net: Kconfig & Makefile cleanup

2011-08-27 00:58:49 -07:00

usb

net: remove netdev_alloc_page and use __GFP_COLD

2011-11-22 16:43:32 -05:00

vmxnet3

net: make vlan ndo_vlan_rx_[add/kill]_vid return error value

2011-12-08 19:52:37 -05:00

wan

wan: make LAPB callbacks const

2011-09-16 19:20:20 -04:00

wimax

drivers/net: Add moduleparam.h to drivers as required.

2011-10-31 19:31:09 -04:00

wireless

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-16 02:11:14 -05:00

xen-netback

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-06 21:10:05 -05:00

dummy.c

net: remove NETIF_F_NO_CSUM feature bit

2011-11-16 17:43:12 -05:00

eql.c

…

ifb.c

net: remove NETIF_F_NO_CSUM feature bit

2011-11-16 17:43:12 -05:00

Kconfig

dsa: Move switch drivers to new directory drivers/net/dsa

2011-11-29 00:21:36 -05:00

LICENSE.SRC

…

loopback.c

net: remove NETIF_F_NO_CSUM feature bit

2011-11-16 17:43:12 -05:00

macvlan.c

net: introduce vlan_vid_[add/del] and use them instead of direct [add/kill]_vid ndo calls

2011-12-08 19:52:42 -05:00

macvtap.c

net: treewide use of RCU_INIT_POINTER

2011-11-23 18:48:19 -05:00

Makefile

dsa: Move switch drivers to new directory drivers/net/dsa

2011-11-29 00:21:36 -05:00

mdio.c

…

mii.c

net: Change mii to ethtool advertisement function names

2011-11-21 15:27:19 -05:00

netconsole.c

netconsole: enable netconsole can make net_device refcnt incorrent

2011-10-18 23:55:29 -04:00

rionet.c

drivers/net/rionet.c: fix ethernet address macros for LE platforms

2011-11-02 16:07:01 -07:00

sb1000.c

…

Space.c

…

sungem_phy.c

…

tun.c

Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of drivers

2011-11-22 16:43:32 -05:00

veth.c

Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of drivers

2011-11-22 16:43:32 -05:00

virtio_net.c

net: make vlan ndo_vlan_rx_[add/kill]_vid return error value

2011-12-08 19:52:37 -05:00

xen-netfront.c

xen-netfront: delay gARP until backend switches to Connected

2011-12-12 19:02:41 -05:00