1
linux/arch/powerpc/platforms/512x
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
..
clock.c powerpc: Fix up modules that should be including module.h 2011-10-31 19:30:38 -04:00
Kconfig gpio: move mpc8xxx/512x gpio driver to drivers/gpio 2011-09-23 00:14:15 +02:00
Makefile powerpc/5121: add initial support for PDM360NG board 2010-08-01 17:06:44 -06:00
mpc512x_shared.c drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported 2011-10-05 01:10:12 +00:00
mpc512x.h powerpc/5121: shared DIU framebuffer support 2010-08-01 17:06:44 -06:00
mpc5121_ads_cpld.c powerpc/mpc5121_ads_cpld: Remove use of NO_IRQ_IGNORE 2011-05-19 15:31:47 +10:00
mpc5121_ads.c powerpc/5121: shared DIU framebuffer support 2010-08-01 17:06:44 -06:00
mpc5121_ads.h powerpc/mpc5121: Add support for CPLD on MPC5121ADS board 2008-07-12 12:10:55 -06:00
mpc5121_generic.c of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
pdm360ng.c powerpc/5121: add initial support for PDM360NG board 2010-08-01 17:06:44 -06:00