linux/drivers/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
..
xen-pciback xen: Add module.h to modular drivers/xen users. 2011-10-31 19:32:11 -04:00
xenbus 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
xenfs
balloon.c xen: Add module.h to modular drivers/xen users. 2011-10-31 19:32:11 -04:00
biomerge.c
cpu_hotplug.c
events.c Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2011-10-26 16:44:09 +02:00
evtchn.c
features.c
gntalloc.c
gntdev.c xen/gntdev: Fix sleep-inside-spinlock 2011-10-14 10:02:10 -04:00
grant-table.c xen: modify kernel mappings corresponding to granted pages 2011-09-29 10:32:58 -04:00
Kconfig xen: remove XEN_PLATFORM_PCI config option 2011-09-29 10:52:16 -04:00
Makefile xen: remove XEN_PLATFORM_PCI config option 2011-09-29 10:52:16 -04:00
manage.c xen: Add export.h for THIS_MODULE/EXPORT_SYMBOL to various xen users. 2011-10-31 19:32:11 -04:00
pci.c xen/pci: support multi-segment systems 2011-09-22 16:23:46 -04:00
platform-pci.c
swiotlb-xen.c xen: Add export.h for THIS_MODULE/EXPORT_SYMBOL to various xen users. 2011-10-31 19:32:11 -04:00
sys-hypervisor.c
tmem.c
xen-balloon.c
xen-selfballoon.c Merge branches 'stable/bug.fixes-3.2' and 'stable/mmu.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen 2011-10-25 09:17:47 +02:00
xencomm.c