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
..
eeprom.c	drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:08 -04:00
eeprom.h	p54: enhance rssi->dBm database import	2011-02-14 15:52:10 -05:00
fwio.c	drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:08 -04:00
Kconfig	p54spi: Update kconfig help text	2011-03-07 13:51:04 -05:00
led.c
lmac.h	p54: implement multicast filter	2011-04-26 15:50:30 -04:00
main.c	drivers/net: Add module.h to drivers who were implicitly using it	2011-10-31 19:31:07 -04:00
Makefile
net2280.h
p54.h	p54: improve site survey	2011-08-24 14:57:13 -04:00
p54pci.c	drivers/net: Add module.h to drivers who were implicitly using it	2011-10-31 19:31:07 -04:00
p54pci.h	net: remove interrupt.h inclusion from netdevice.h	2011-06-06 22:55:11 -07:00
p54spi_eeprom.h	p54spi: update sample eeprom	2011-02-14 15:52:10 -05:00
p54spi.c	p54spi: Fix workqueue deadlock	2011-11-17 14:40:37 -05:00
p54spi.h
p54usb.c	USB: convert drivers/net/* to use module_usb_driver()	2011-11-18 09:44:20 -08:00
p54usb.h
txrx.c	drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:08 -04:00