Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 ... This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file, and it fixes the build error in the arch/x86/kernel/microcode_core.c file, that the merge did not catch. The microcode_core.c patch was provided by Stephen Rothwell <sfr@canb.auug.org.au> who was invaluable in the merge issues involved with the large sysdev removal process in the driver-core tree. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2012-01-06 11:42:52 -08:00
..
appletalk
arcnet	net: Revert ARCNET and PHYLIB to tristate options	2011-11-26 14:36:49 -05:00
bonding	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
caif	caif-hsi: Added recovery check of CA wake status.	2011-10-19 03:25:43 -04:00
can	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
cris
ethernet	net: fsl: fec: fix build for mx23-only kernel	2012-01-03 13:48:41 -05:00
fddi
hamradio
hippi	net: drivers/net/hippi/Kconfig should be sourced	2011-11-09 15:55:06 -05:00
irda	USB: convert drivers/net/* to use module_usb_driver()	2011-11-18 09:44:20 -08:00
phy	net: Revert ARCNET and PHYLIB to tristate options	2011-11-26 14:36:49 -05:00
plip
ppp	ppp: fix pptp double release_sock in pptp_bind()	2011-12-07 13:29:04 -05:00
slip
tokenring
usb	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08: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 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
xen-netback	netback: Fix alert message.	2011-12-06 00:32:39 -05:00
dummy.c
eql.c
ifb.c
Kconfig	net: drivers/net/hippi/Kconfig should be sourced	2011-11-09 15:55:06 -05: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
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