kernel-ark/drivers/tty/hvc
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
..
hvc_beat.c
hvc_bfin_jtag.c
hvc_console.c hvc_console: display printk messages on console. 2011-10-18 14:17:10 -07:00
hvc_console.h powerpc/pseries: Re-implement HVSI as part of hvc_vio 2011-06-29 17:48:35 +10:00
hvc_dcc.c
hvc_irq.c TTY: irq: Remove IRQF_DISABLED 2011-09-22 16:08:57 -07:00
hvc_iseries.c tty: Add module.h to drivers/tty users who just expect it there. 2011-10-31 19:31:27 -04:00
hvc_iucv.c Fix common misspellings 2011-03-31 11:26:23 -03:00
hvc_opal.c powerpc/powernv: Support for OPAL console 2011-09-20 16:09:54 +10:00
hvc_rtas.c
hvc_tile.c
hvc_udbg.c
hvc_vio.c tty: Add module.h to drivers/tty users who just expect it there. 2011-10-31 19:31:27 -04:00
hvc_xen.c drivers: Final irq namespace conversion 2011-03-29 14:48:19 +02:00
hvcs.c Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-11-06 17:12:03 -08:00
hvsi_lib.c powerpc/powernv: Support for OPAL console 2011-09-20 16:09:54 +10:00
hvsi.c TTY: irq: Remove IRQF_DISABLED 2011-09-22 16:08:57 -07:00
Kconfig powerpc/powernv: Support for OPAL console 2011-09-20 16:09:54 +10:00
Makefile powerpc/powernv: Support for OPAL console 2011-09-20 16:09:54 +10:00