kernel_optimize_test/drivers/s390/char
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
..
con3215.c [S390] fix mismatch in summation of I/O IRQ statistics 2011-10-30 15:16:15 +01:00
con3270.c
ctrlchar.c
ctrlchar.h
defkeymap.c
defkeymap.map
fs3270.c s390: add missing module.h/export.h includes 2011-10-31 19:30:58 -04:00
Kconfig
keyboard.c
keyboard.h
Makefile
monreader.c
monwriter.c
raw3270.c [S390] fix mismatch in summation of I/O IRQ statistics 2011-10-30 15:16:15 +01:00
raw3270.h
sclp_async.c
sclp_cmd.c [S390] cleanup psw related bits and pieces 2011-10-30 15:16:43 +01:00
sclp_con.c
sclp_config.c
sclp_cpi_sys.c s390: add missing module.h/export.h includes 2011-10-31 19:30:58 -04:00
sclp_cpi_sys.h
sclp_cpi.c
sclp_ocf.c
sclp_quiesce.c [S390] cleanup psw related bits and pieces 2011-10-30 15:16:43 +01:00
sclp_rw.c
sclp_rw.h
sclp_sdias.c
sclp_tty.c
sclp_tty.h
sclp_vt220.c
sclp.c
sclp.h
tape_34xx.c [S390] fix mismatch in summation of I/O IRQ statistics 2011-10-30 15:16:15 +01:00
tape_3590.c [S390] fix mismatch in summation of I/O IRQ statistics 2011-10-30 15:16:15 +01:00
tape_3590.h
tape_char.c
tape_class.c
tape_class.h
tape_core.c [S390] fix mismatch in summation of I/O IRQ statistics 2011-10-30 15:16:15 +01:00
tape_proc.c
tape_std.c
tape_std.h
tape.h
tty3270.c
tty3270.h
vmcp.c s390: add missing module.h/export.h includes 2011-10-31 19:30:58 -04:00
vmcp.h
vmlogrdr.c
vmur.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
vmur.h
vmwatchdog.c
zcore.c [S390] zcore: add missing module.h include 2011-10-30 15:16:44 +01:00