Greg Kroah-Hartman 407f3fd8fa Merge 3.2-rc5 into staging-next ... This resolves the conflict in the drivers/staging/iio/industrialio-core.c file due to two different changes made to resolve the same problem. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-12-09 19:01:27 -08:00
..
appletalk
arcnet	net: Revert ARCNET and PHYLIB to tristate options	2011-11-26 14:36:49 -05:00
bonding	bonding: only use primary address for ARP	2011-11-30 22:59:11 -05:00
caif	caif-hsi: Added recovery check of CA wake status.	2011-10-19 03:25:43 -04:00
can	net, sja1000: Don't include version.h in peak_pci.c when not needed	2011-11-21 16:43:53 -05:00
cris
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2011-12-09 08:08:57 -08:00
fddi
hamradio
hippi	net: drivers/net/hippi/Kconfig should be sourced	2011-11-09 15:55:06 -05:00
hyperv	net/hyperv: Fix the stop/wake queue mechanism	2011-12-09 16:26:50 -08:00
irda	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2011-11-03 13:28:14 -07:00
phy	net: Revert ARCNET and PHYLIB to tristate options	2011-11-26 14:36:49 -05:00
plip
ppp	Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2011-10-24 18:18:09 -04:00
slip
tokenring
usb	net-next:asix: V2 Update VERSION	2011-11-15 16:26:07 -05:00
vmxnet3	drivers/net: Add module.h to drivers who were implicitly using it	2011-10-31 19:31:07 -04:00
wan
wimax	drivers/net: Add moduleparam.h to drivers as required.	2011-10-31 19:31:09 -04:00
wireless	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2011-12-05 11:05:44 -05:00
xen-netback	netback: Fix alert message.	2011-12-06 00:32:39 -05:00
dummy.c
eql.c
ifb.c
Kconfig	staging: hv: move hv_netvsc out of staging area	2011-11-29 16:12:36 +09:00
LICENSE.SRC
loopback.c
macvlan.c	macvlan: receive multicast with local address	2011-11-04 17:39:32 -04:00
macvtap.c	macvtap: Fix the minor device number allocation	2011-10-21 02:53:07 -04:00
Makefile	staging: hv: move hv_netvsc out of staging area	2011-11-29 16:12:36 +09:00
mdio.c
mii.c
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
veth.c	drivers/net: Add module.h to drivers who were implicitly using it	2011-10-31 19:31:07 -04:00
virtio_net.c	virtio-net: Use virtio_config_val() for retrieving config	2011-11-02 11:40:58 +10:30
xen-netfront.c	net: add skb frag size accessors	2011-10-19 03:10:46 -04:00