Greg Kroah-Hartman 61906313bd Merge 3.4-rc6 into usb-next ...

This resolves the conflict with:
	drivers/usb/host/ehci-tegra.c

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

2012-05-07 09:03:39 -07:00

..

appletalk

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

arcnet

arcnet: rimi: Fix device name in debug output

2012-04-17 22:22:43 -04:00

bonding

bonding: properly unset current_arp_slave on slave link up

2012-04-05 19:07:59 -04:00

caif

caif_hsi: use dev_dbg not dev_err for reporting

2012-04-13 11:01:44 -04:00

can

can: usb: PCAN-USB Pro: fix mem leaks in pcan_usb_pro_init() on error paths

2012-04-16 21:34:50 +02:00

cris

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

dsa

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

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

ethernet

sungem: Fix WakeOnLan

2012-05-03 01:42:55 -04:00

fddi

…

hamradio

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

hippi

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

hyperv

net/hyperv: Adding cancellation to ensure rndis filter is closed

2012-04-21 15:38:10 -04:00

irda

USB: stir4200.c: remove err() usage

2012-04-25 14:48:51 -07:00

phy

icplus: fix interrupt for IC+ 101A/G and 1001LF

2012-04-19 15:34:18 -04:00

plip

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ppp

ppp: Fix race condition with queue start/stop

2012-04-13 13:06:47 -04:00

slip

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

team

net: use eth_hw_addr_random() and reset addr_assign_type

2012-02-15 15:34:17 -05:00

tokenring

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

usb

Merge 3.4-rc6 into usb-next

2012-05-07 09:03:39 -07:00

vmxnet3

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

2012-03-05 21:16:26 -05:00

wan

drivers/net/wan/farsync.c: add missing iounmap

2012-04-17 22:31:59 -04:00

wimax

Merge branch 'akpm' (Andrew's patch-bomb)

2012-04-05 15:30:34 -07:00

wireless

Merge 3.4-rc6 into usb-next

2012-05-07 09:03:39 -07:00

xen-netback

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

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

dummy.c

dummy: Add ndo_uninit().

2012-04-16 23:56:36 -04:00

eql.c

eql: dont rely on HZ=100

2012-03-27 22:45:26 -04:00

ifb.c

net: replace random_ether_addr() with eth_hw_addr_random()

2012-02-15 15:34:16 -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

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

macvlan.c

net: use eth_hw_addr_random() and reset addr_assign_type

2012-02-15 15:34:17 -05:00

macvtap.c

security: trim security.h

2012-02-14 10:45:42 +11: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

ethtool, mdio, mii: Specify MDIO information fields in struct ethtool_cmd

2012-03-01 16:41:26 -05:00

mii.c

ethtool, mdio, mii: Specify MDIO information fields in struct ethtool_cmd

2012-03-01 16:41:26 -05:00

netconsole.c

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

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

rionet.c

rionet: fix page allocation order of rionet_active

2012-04-01 23:17:16 -04:00

sb1000.c

…

Space.c

CS89x0 : add platform driver support

2012-02-01 16:49:50 +01:00

sungem_phy.c

…

tun.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

veth.c

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

2012-02-19 16:03:15 -05:00

virtio_net.c

net: Fix misplaced parenthesis in virtio_net.c

2012-04-13 11:01:44 -04:00

xen-netfront.c

Two fixes for regressions:

2012-04-06 17:54:53 -07:00