Jiri Kosina e75d660672 Merge branch 'master' into for-next ...

Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c

2012-04-08 21:48:52 +02:00

..

appletalk

Remove all #inclusions of asm/system.h

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

arcnet

Remove all #inclusions of asm/system.h

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

bonding

bonding: properly unset current_arp_slave on slave link up

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

caif

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

can

Remove all #inclusions of asm/system.h

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

cris

Remove all #inclusions of asm/system.h

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

dsa

…

ethernet

Merge branch 'master' into for-next

2012-04-08 21:48:52 +02: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: Fix the code handling tx busy

2012-03-19 17:27:06 -04:00

irda

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

2012-03-30 11:46:20 +01:00

phy

phy:icplus:fix Auto Power Saving in ip101a_config_init.

2012-04-03 18:48:58 -04:00

plip

Remove all #inclusions of asm/system.h

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

ppp

ppp: Don't stop and restart queue on every TX packet

2012-04-03 17:31:38 -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: usb: cdc_eem: fix mtu

2012-04-01 23:32:35 -04:00

vmxnet3

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

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

wan

Documentation: remove references to /etc/modprobe.conf

2012-03-30 16:03:15 -07:00

wimax

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

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

wireless

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

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

xen-netback

…

dummy.c

…

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

virtio_net: do not rate limit counter increments

2012-03-28 04:40:45 -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