This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

Greg Kroah-Hartman f7a0d426f3 Merge 3.3-rc7 into usb-next ...

This resolves the conflict with drivers/usb/host/ehci-fsl.h that
happened with changes in Linus's and this branch at the same time.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-03-12 09:13:31 -07:00

..

appletalk

…

arcnet

net: Revert ARCNET and PHYLIB to tristate options

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

bonding

bonding: fix enslaving in alb mode when link down

2012-01-18 20:59:53 -05:00

caif

caif-hsi: Set default MTU to 4096

2012-03-06 16:27:45 -05:00

can

can: sja1000: fix isr hang when hw is unplugged under load

2012-02-20 11:36:56 +01:00

cris

…

dsa

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

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

ethernet

mlx4_core: fix bug in modify_cq wrapper for resize flow.

2012-03-08 00:28:01 -08:00

fddi

…

hamradio

…

hippi

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

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

hyperv

net/hyperv: Use the built-in macro KBUILD_MODNAME for this driver

2012-03-08 13:55:27 -08:00

irda

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-01-14 13:05:21 -08:00

phy

phy: IC+101G and PHY_HAS_INTERRUPT flag

2012-02-23 17:14:26 -05:00

plip

…

ppp

ppp: fix 'ppp_mp_reconstruct bad seq' errors

2012-02-24 17:53:21 -05:00

slip

…

team

team: send only changed options/ports via netlink

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

tokenring

CONFIG_TR/CONFIG_LLC: work around the problem with select

2012-02-07 13:06:14 -05:00

usb

Merge 3.3-rc7 into usb-next

2012-03-12 09:13:31 -07:00

vmxnet3

vmxnet3: Fix transport header size

2012-03-01 22:09:41 -05:00

wan

module_param: make bool parameters really bool (net & drivers/net)

2011-12-19 22:27:29 -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

iwlwifi: fix wowlan suspend

2012-03-05 14:44:39 -05:00

xen-netback

Merge branch 'stable/for-linus-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2012-01-10 10:09:59 -08: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

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

veth: Enforce minimum size of VETH_INFO_PEER

2012-02-15 14:59:20 -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

xen-netfront: correct MAX_TX_TARGET calculation.

2012-01-26 13:48:35 -05:00