linux/arch/ia64/xen
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
..
gate-data.S Rename .data.gate to .data..gate. 2010-03-03 11:25:59 +01:00
grant-table.c xen: use generic functions instead of xen_{alloc, free}_vm_area() 2011-09-29 15:02:18 -04:00
hypercall.S [IA64] Remove COMPAT_IA32 support 2010-02-08 10:42:17 -08:00
hypervisor.c ia64: Add export.h to arch/ia64 specific files as required 2011-10-31 19:30:58 -04:00
irq_xen.c sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
irq_xen.h ia64/pv_ops/xen: implement xen pv_irq_ops. 2008-10-17 10:07:33 -07:00
Kconfig [IA64] fixes configs and add default config for ia64 xen domU 2009-02-19 11:39:06 -08:00
machvec.c ia64/xen: define xen machine vector for domU. 2008-10-17 10:08:56 -07:00
Makefile ia64/pv_ops/xen/gate.S: xen gate page paravirtualization 2009-03-26 11:01:55 -07:00
suspend.c xen: suspend: add "arch" to pre/post suspend hooks 2011-02-25 16:43:12 +00:00
time.c ia64: Switch do_timer() to xtime_update() 2011-01-31 14:55:45 +01:00
time.h ia64/xen: preliminary support for save/restore. 2008-10-17 10:09:25 -07:00
xcom_hcall.c ia64/xen: xencomm conversion functions for hypercalls 2008-10-17 10:00:19 -07:00
xen_pv_ops.c [IA64] xen: use ARRAY_SIZE macro in xen_pv_ops.c 2010-09-23 14:26:30 -07:00
xencomm.c ia64/xen: xencomm conversion functions for hypercalls 2008-10-17 10:00:19 -07:00
xenivt.S ia64/pv_ops/xen: paravirtualize ivt.S for xen. 2008-10-17 10:05:08 -07:00
xensetup.S Rename .data.read_mostly to .data..read_mostly. 2010-03-03 11:26:00 +01:00