linux-kernel-test/arch/powerpc/platforms/86xx
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
..
gef_gpio.c powerpc: Fix up modules that should be including module.h 2011-10-31 19:30:38 -04:00
gef_pic.c powerpc/irq: Stop exporting irq_map 2011-05-04 15:02:15 +10:00
gef_pic.h powerpc: GE Fanuc's FPGA based PIC controller on the SBC610 2008-10-13 11:09:57 -05:00
gef_ppc9a.c powerpc/86xx: Renaming following split of GE Fanuc joint venture 2010-03-04 10:43:44 -06:00
gef_sbc310.c powerpc/86xx: Renaming following split of GE Fanuc joint venture 2010-03-04 10:43:44 -06:00
gef_sbc610.c powerpc/86xx: Renaming following split of GE Fanuc joint venture 2010-03-04 10:43:44 -06:00
Kconfig gpio: move mpc8xxx/512x gpio driver to drivers/gpio 2011-09-23 00:14:15 +02:00
Makefile powerpc/86xx: Board support for GE Fanuc's PPC9A 2009-03-19 04:01:00 -05:00
mpc86xx_hpcn.c lmb: rename to memblock 2010-07-14 17:14:00 +10:00
mpc86xx_smp.c powerpc/smp: smp_ops->kick_cpu() should be able to fail 2011-04-20 17:01:18 +10:00
mpc86xx.h powerpc/86xx: Refactor pic init 2008-07-14 07:55:41 -05:00
mpc8610_hpcd.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next 2011-08-29 09:14:30 +00:00
pic.c powerpc: Convert to new irq_* function names 2011-03-29 14:48:12 +02:00
sbc8641d.c powerpc/86xx: clean up smp init code 2009-05-19 00:50:20 -05:00