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
..
ath	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
b43	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2012-01-04 11:37:30 -05:00
b43legacy	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
brcm80211	Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2011-11-09 16:22:15 -05:00
hostap	drivers/net: Add moduleparam.h to drivers as required.	2011-10-31 19:31:09 -04:00
ipw2x00	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2011-10-25 15:18:39 +02:00
iwlegacy	drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:08 -04:00
iwlwifi	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2011-12-21 13:18:22 -05:00
iwmc3200wifi	drivers/net: Add moduleparam.h to drivers as required.	2011-10-31 19:31:09 -04:00
libertas	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
libertas_tf	USB: convert drivers/net/* to use module_usb_driver()	2011-11-18 09:44:20 -08:00
mwifiex	mwifiex: fix crash during simultaneous scan and connect	2012-01-03 14:40:45 -05:00
orinoco	USB: convert drivers/net/* to use module_usb_driver()	2011-11-18 09:44:20 -08:00
p54	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
prism54	prism54: potential memory corruption in prism54_get_essid()	2011-11-21 14:45:21 -05:00
rt2x00	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
rtl818x	USB: convert drivers/net/* to use module_usb_driver()	2011-11-18 09:44:20 -08:00
rtlwifi	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
wl12xx	Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2011-11-09 16:22:15 -05:00
wl1251
zd1211rw	drivers/net: Add module.h to drivers who were implicitly using it	2011-10-31 19:31:07 -04:00
adm8211.c	drivers/net: Add module.h to drivers who were implicitly using it	2011-10-31 19:31:07 -04:00
adm8211.h
airo_cs.c
airo.c
airo.h
at76c50x-usb.c	wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack	2011-10-31 17:30:57 -07:00
at76c50x-usb.h
atmel_cs.c
atmel_pci.c
atmel.c
atmel.h
Kconfig	net: wireless: add brcm80211 drivers	2011-10-11 15:55:30 -04:00
mac80211_hwsim.c	drivers/net: Add module.h to drivers who were implicitly using it	2011-10-31 19:31:07 -04:00
mac80211_hwsim.h
Makefile	net: wireless: add brcm80211 drivers	2011-10-11 15:55:30 -04:00
mwl8k.c
ray_cs.c
ray_cs.h
rayctl.h
rndis_wlan.c	USB: convert drivers/net/* to use module_usb_driver()	2011-11-18 09:44:20 -08:00
wl3501_cs.c
wl3501.h
zd1201.c	USB: convert drivers/net/* to use module_usb_driver()	2011-11-18 09:44:20 -08:00
zd1201.h