2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-30 16:13:54 +08:00
linux-next/arch/m68k
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
..
amiga m68k/amiga: Chip RAM - Use lookup_resource() 2011-07-30 21:21:39 +02:00
apollo m68k: apollo core - Kill warn_unused_result warnings 2009-01-12 20:56:35 +01:00
atari m68k: Add export.h to the m68k specific files as required 2011-10-31 19:30:59 -04:00
bvme6000 m68k: Switch do_timer() to xtime_update() 2011-01-31 14:55:46 +01:00
configs m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
emu block: remove support for bio remapping from ->make_request 2011-09-12 12:12:01 +02:00
fpsp040 Fix common misspellings 2011-03-31 11:26:23 -03:00
hp300 m68k: hp300 - Checkpatch cleanup 2010-05-17 21:15:40 +02:00
ifpsp060 Fix common misspellings 2011-03-31 11:26:23 -03:00
include/asm m68knommu: create common externs for _ram* vars 2011-10-18 14:22:26 +10:00
kernel m68k: Add export.h to the m68k specific files as required 2011-10-31 19:30:59 -04:00
lib m68k: fix memcpy to unmatched/unaligned source and dest on 68000 2011-10-18 14:22:24 +10:00
mac m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC 2011-10-24 21:00:34 +02:00
math-emu m68k/math-emu: Remove unnecessary code 2011-07-30 21:21:40 +02:00
mm m68knommu: create common externs for _ram* vars 2011-10-18 14:22:26 +10:00
mvme16x m68k: Switch do_timer() to xtime_update() 2011-01-31 14:55:46 +01:00
mvme147 m68k: Switch do_timer() to xtime_update() 2011-01-31 14:55:46 +01:00
platform m68k: merge mmu and non-mmu include/asm/entry.h files 2011-10-18 14:22:25 +10:00
q40 doc: fix broken references 2011-09-27 18:08:04 +02:00
sun3 m68k: Switch do_timer() to xtime_update() 2011-01-31 14:55:46 +01:00
sun3x include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
tools/amiga Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
Kconfig m68k: reorganize Kconfig options to improve mmu/non-mmu selections 2011-10-18 14:22:25 +10:00
Kconfig.bus m68k: reorganize Kconfig options to improve mmu/non-mmu selections 2011-10-18 14:22:25 +10:00
Kconfig.cpu m68k: reorganize Kconfig options to improve mmu/non-mmu selections 2011-10-18 14:22:25 +10:00
Kconfig.debug m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
Kconfig.devices m68k: drop unused Kconfig symbols 2011-10-21 15:15:20 +10:00
Kconfig.machine m68k: drop unused Kconfig symbols 2011-10-21 14:56:43 +10:00
Makefile m68k: merge mmu and non-mmu arch Makefiles 2011-10-18 14:22:25 +10:00