Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next ...

This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

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

2012-05-02 11:48:07 -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

…

ethernet

drivers/net: Do not free an IRQ if its request failed

2012-04-21 16:41:11 -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

ARM: sa11x0: fix build errors from DMA engine API updates

2012-03-30 11:46:20 +01: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

…

tokenring

Remove all #inclusions of asm/system.h

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

usb

net: qmi_wwan: support Sierra Wireless MC77xx devices in QMI mode

2012-04-19 15:26:42 -04:00

vmxnet3

…

wan

Merge 3.4-rc5 into staging-next

2012-05-02 11:48:07 -07:00

wimax

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

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

wireless

ath9k: Fix TX fragmentation

2012-04-17 14:17:05 -04:00

xen-netback

…

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

…

Kconfig

…

LICENSE.SRC

…

loopback.c

Remove all #inclusions of asm/system.h

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

macvlan.c

…

macvtap.c

…

Makefile

…

mdio.c

…

mii.c

…

netconsole.c

…

rionet.c

rionet: fix page allocation order of rionet_active

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

sb1000.c

…

Space.c

…

sungem_phy.c

…

tun.c

Remove all #inclusions of asm/system.h

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

veth.c

…

virtio_net.c

net: Fix misplaced parenthesis in virtio_net.c

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

xen-netfront.c

Merge tag 'stable/for-linus-3.4-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

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