linux/drivers/infiniband/hw/ipath
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
ipath_common.h
ipath_cq.c
ipath_debug.h
ipath_diag.c infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:35 -04:00
ipath_dma.c
ipath_driver.c infiniband: Fix up module files that need to include module.h 2011-10-31 19:31:35 -04:00
ipath_eeprom.c
ipath_file_ops.c infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:35 -04:00
ipath_fs.c
ipath_iba6110.c
ipath_init_chip.c infiniband: add moduleparam.h to drivers/infiniband as required 2011-10-31 19:31:36 -04:00
ipath_intr.c
ipath_kernel.h
ipath_keys.c
ipath_mad.c IB/pma: Add include file for IBA performance counters definitions 2011-07-18 21:04:35 -07:00
ipath_mmap.c
ipath_mr.c
ipath_qp.c
ipath_rc.c
ipath_registers.h
ipath_ruc.c
ipath_sdma.c
ipath_srq.c RDMA/core: Add SRQ type field 2011-10-13 09:13:26 -07:00
ipath_stats.c
ipath_sysfs.c infiniband: Fix up users implicitly relying on getting stat.h 2011-10-31 19:31:34 -04:00
ipath_uc.c
ipath_ud.c
ipath_user_pages.c mm: distinguish between mlocked and pinned pages 2011-10-31 17:30:46 -07:00
ipath_user_sdma.c
ipath_user_sdma.h
ipath_verbs.c infiniband: Fix up module files that need to include module.h 2011-10-31 19:31:35 -04:00
ipath_verbs.h
ipath_verbs_mcast.c
ipath_wc_ppc64.c
ipath_wc_x86_64.c