kernel-ark/drivers/s390/cio
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
..
airq.c
blacklist.c
blacklist.h
ccwgroup.c [S390] ccwgroup: cleanup 2011-10-30 15:16:43 +01:00
ccwreq.c [S390] cio: add message for timeouts on internal I/O 2011-10-30 15:16:41 +01:00
chp.c s390: add missing module.h/export.h includes 2011-10-31 19:30:58 -04:00
chp.h
chsc_sch.c [S390] chsc_sch: add support for irq statistics 2011-10-30 15:16:44 +01:00
chsc_sch.h
chsc.c
chsc.h
cio_debug.h
cio.c [S390] kdump backend code 2011-10-30 15:16:42 +01:00
cio.h
cmf.c
crw.c
css.c
css.h [S390] sparse: fix sparse warnings about missing prototypes 2011-10-30 15:16:46 +01:00
device_fsm.c
device_id.c
device_ops.c
device_pgid.c
device_status.c
device.c [S390] fix mismatch in summation of I/O IRQ statistics 2011-10-30 15:16:15 +01:00
device.h [S390] fix mismatch in summation of I/O IRQ statistics 2011-10-30 15:16:15 +01:00
fcx.c
idset.c
idset.h
io_sch.h [S390] fix mismatch in summation of I/O IRQ statistics 2011-10-30 15:16:15 +01:00
ioasm.h
isc.c
itcw.c
Makefile
orb.h
qdio_debug.c 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
qdio_debug.h
qdio_main.c [S390] qdio: prevent dsci access without adapter interrupts 2011-10-30 15:16:47 +01:00
qdio_setup.c s390: add missing module.h/export.h includes 2011-10-31 19:30:58 -04:00
qdio_thinint.c [S390] qdio: prevent dsci access without adapter interrupts 2011-10-30 15:16:47 +01:00
qdio.h [S390] qdio: prevent dsci access without adapter interrupts 2011-10-30 15:16:47 +01:00