linux_dsm_epyc7002/drivers/net/wireless/rtlwifi
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
..
rtl8192c drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
rtl8192ce Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem 2011-12-09 14:07:12 -05:00
rtl8192cu Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
rtl8192de Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem 2011-12-09 14:07:12 -05:00
rtl8192se Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem 2011-12-09 14:07:12 -05:00
base.c drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
base.h
cam.c drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
cam.h
core.c mac80211: pass vif param to conf_tx() callback 2011-10-03 15:22:41 -04:00
core.h
debug.c rtlwifi: Change debug parameter to apply to individual drivers 2011-10-11 16:41:22 -04:00
debug.h
efuse.c drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
efuse.h
Kconfig um: a couple of missing dependencies... 2011-11-02 14:15:28 +01:00
Makefile
pci.c drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
pci.h rtlwifi: Change PCI drivers to use the new PM framework 2011-10-14 14:48:14 -04:00
ps.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem 2011-11-30 14:14:42 -05:00
ps.h
rc.c
rc.h
regd.c
regd.h
usb.c drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
usb.h
wifi.h rtlwifi: rtl8192se: Updates from latest Realtek driver version - Part II 2011-10-14 14:48:15 -04:00