linux/drivers/net/wireless
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
ath 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
b43 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
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 staging: Add module.h to more drivers implicitly using it. 2011-10-31 19:32:10 -04: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 drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
iwmc3200wifi drivers/net: Add moduleparam.h to drivers as required. 2011-10-31 19:31:09 -04:00
libertas drivers/net: change moduleparam.h to module.h as required. 2011-10-31 19:31:08 -04:00
libertas_tf drivers/net: change moduleparam.h to module.h as required. 2011-10-31 19:31:08 -04:00
mwifiex Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem 2011-10-17 15:05:26 -04:00
orinoco drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
p54 drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
prism54
rt2x00 mac80211: pass vif param to conf_tx() callback 2011-10-03 15:22:41 -04:00
rtl818x drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
rtlwifi 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
wl12xx drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
wl1251 mac80211: pass vif param to conf_tx() callback 2011-10-03 15:22:41 -04:00
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 mac80211: pass vif param to conf_tx() callback 2011-10-03 15:22:41 -04:00
ray_cs.c
ray_cs.h
rayctl.h
rndis_wlan.c
wl3501_cs.c wl3501_cs: min_t() cast truncates high bits 2011-09-27 14:36:04 -04:00
wl3501.h
zd1201.c
zd1201.h