davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
ff4b8a57f0
kernel-ark/drivers/net/usb
History
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
..
asix.c Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
catc.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
cdc_eem.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
cdc_ether.c Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
cdc_ncm.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
cdc_subset.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
cdc-phonet.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
cx82310_eth.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
dm9601.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
gl620a.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
hso.c hso: fix a use after free condition 2011-07-08 09:07:59 -07:00
int51x1.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
ipheth.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
kalmia.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
kaweth.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
Kconfig MII: fix Kconfig dependencies for MII 2011-09-15 15:49:08 -04:00
lg-vl600.c Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
Makefile net/usb: Add Samsung Kalmia driver for Samsung GT-B3730 2011-06-16 21:57:49 -04:00
mcs7830.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
net1080.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
pegasus.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
pegasus.h
plusb.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
rndis_host.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
rtl8150.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
sierra_net.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
smsc75xx.c Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
smsc75xx.h
smsc95xx.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
smsc95xx.h
usbnet.c usbnet: fix oops in usbnet_start_xmit 2011-11-07 13:25:41 -05:00
zaurus.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00