linux-stable-rt/drivers/net/wireless/ath/ath6kl
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
..
Kconfig
Makefile
bmi.c
bmi.h
cfg80211.c drivers/net: Add moduleparam.h to drivers as required. 2011-10-31 19:31:09 -04:00
cfg80211.h
common.h
core.h ath6kl: silence "invalid rate" warning 2011-09-28 19:03:47 +03:00
debug.c drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
debug.h treewide: use __printf not __attribute__((format(printf,...))) 2011-10-31 17:30:54 -07:00
hif-ops.h
hif.h
htc.c ath6kl: add prefix parameter to ath6kl_dbg_dump() 2011-09-28 19:27:30 +03:00
htc.h
htc_hif.c
htc_hif.h
init.c ath6kl: fix size_t related warnings 2011-10-01 12:05:36 +03:00
main.c ath6kl: Update BSS information after connection 2011-09-22 10:07:59 +03:00
sdio.c drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
target.h
testmode.c
testmode.h
txrx.c ath6kl: add prefix parameter to ath6kl_dbg_dump() 2011-09-28 19:27:30 +03:00
wmi.c ath6kl: improve wmi debug messages 2011-09-28 19:27:31 +03:00
wmi.h ath6kl: Report PMKSA candidate events through cfg80211 2011-09-22 10:40:40 +03:00