2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
linux-next/arch/powerpc/xmon
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
..
ansidecl.h powerpc: Merge xmon 2005-10-28 22:53:37 +10:00
dis-asm.h [POWERPC] Make xmon disassembly optional 2006-12-04 20:40:32 +11:00
Makefile powerpc/Makefiles: Change to new flag variables 2010-10-13 16:19:22 +11:00
nonstdio.c [POWERPC] fix showing xmon help 2007-07-22 21:30:58 +10:00
nonstdio.h [POWERPC] fix showing xmon help 2007-07-22 21:30:58 +10:00
ppc-dis.c [POWERPC] Import updated version of ppc disassembly code for xmon 2006-12-04 20:40:36 +11:00
ppc-opc.c [POWERPC] Use ARRAY_SIZE macro when appropriate 2007-02-08 16:08:18 +11:00
ppc.h [POWERPC] Import updated version of ppc disassembly code for xmon 2006-12-04 20:40:36 +11:00
spu-dis.c [PATCH] arch/powerpc trivial annotations 2007-02-09 09:14:06 -08:00
spu-insns.h [POWERPC] Import spu disassembly code into xmon 2006-12-04 20:40:29 +11:00
spu-opc.c [POWERPC] Use ARRAY_SIZE macro when appropriate 2007-02-08 16:08:18 +11:00
spu.h [POWERPC] Import spu disassembly code into xmon 2006-12-04 20:40:29 +11:00
start.c [POWERPC] Make xmon_write accept a const buffer 2007-07-22 21:30:58 +10:00
xmon.c 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