1
0
Fork 0
alistair23-linux/drivers/rapidio
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
..
devices RapidIO: add mport driver for Tsi721 bridge 2011-11-02 16:07:01 -07:00
switches drivers/rapidio: idt_gen2.c is implicitly relying on getting stat.h 2011-10-31 19:31:57 -04:00
Kconfig RapidIO: add mport driver for Tsi721 bridge 2011-11-02 16:07:01 -07:00
Makefile RapidIO: add mport driver for Tsi721 bridge 2011-11-02 16:07:01 -07:00
rio-access.c [RAPIDIO] Add RapidIO multi mport support 2008-04-29 19:40:28 +10:00
rio-driver.c rapidio: fix RapidIO sysfs hierarchy 2010-10-27 18:03:15 -07:00
rio-scan.c RapidIO: fix potential null deref in rio_setup_device() 2011-11-02 16:07:01 -07:00
rio-sysfs.c rapidio: modify configuration to support PCI-SRIO controller 2011-03-23 19:46:42 -07:00
rio.c RapidIO/mpc85xx: fix possible mport registration problems 2011-04-14 16:06:56 -07:00
rio.h rapidio: add handling of redundant routes 2010-10-27 18:03:16 -07:00