David S. Miller d07d4c239b Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next ...

Conflicts:
	drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.

2012-02-04 16:42:19 -05:00

..

appletalk

…

arcnet

net: Revert ARCNET and PHYLIB to tristate options

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

bonding

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

caif

caif-hsi: Add RX flip buffer

2012-02-04 16:06:28 -05:00

can

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

2012-02-04 16:42:19 -05:00

cris

…

dsa

drivers/net: dsa/mv88e6xxx.c files need linux/module.h

2012-01-24 15:44:50 -05:00

ethernet

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

2012-02-04 16:39:32 -05:00

fddi

…

hamradio

hamradio: fix incompatible pointer in module parameter

2012-02-01 14:40:01 -05:00

hippi

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

hyperv

net/hyperv: Fix the page buffer when an RNDIS message goes beyond page boundary

2012-02-02 14:35:12 -05:00

irda

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

phy

kernel-doc: fix new warning in net/phy/mdio_bus.c

2012-01-22 15:08:45 -05:00

plip

drivers/net: Remove alloc_etherdev error messages

2012-01-31 16:20:48 -05:00

ppp

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

slip

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

team

team: send only changed options/ports via netlink

2012-01-24 15:51:00 -05:00

tokenring

tms380tr: Fix cascading if/else tab abuse

2012-02-04 16:26:59 -05:00

usb

drivers/net: Remove alloc_etherdev error messages

2012-01-31 16:20:48 -05:00

vmxnet3

vmxnet3: Fix typo in vmxnet3_drv.c

2012-02-01 14:46:25 -05:00

wan

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

wimax

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-01-08 13:21:22 -08:00

wireless

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

2012-02-04 16:39:32 -05:00

xen-netback

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -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

Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2012-01-09 12:18:17 -08:00

LICENSE.SRC

…

loopback.c

net: remove NETIF_F_NO_CSUM feature bit

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

macvlan.c

macvlan: fix a possible use after free

2012-01-23 13:56:18 -05:00

macvtap.c

macvtap: Fix macvtap_get_queue to use rxhash first

2011-12-20 13:45:55 -05:00

Makefile

Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2012-01-09 12:18:17 -08:00

mdio.c

…

mii.c

net: Change mii to ethtool advertisement function names

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

netconsole.c

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05:00

rionet.c

drivers/net: Remove alloc_etherdev error messages

2012-01-31 16:20:48 -05: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

virtio: net: Add freeze, restore handlers to support S4

2012-01-12 15:44:46 +10:30

xen-netfront.c

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

2012-02-04 16:39:32 -05:00