2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 18:53:52 +08:00
linux-next/arch/arm/mach-ep93xx
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
..
include/mach Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
adssphere.c ARM: mach-ep93xx: convert boot_params to atag_offset 2011-08-21 17:14:46 -04:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
core.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
dma.c ep93xx: add dmaengine platform code 2011-06-08 15:45:52 -06:00
edb93xx.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
gesbc9312.c ARM: mach-ep93xx: convert boot_params to atag_offset 2011-08-21 17:14:46 -04:00
Kconfig ep93xx: add support Vision EP9307 SoM 2011-10-17 11:22:11 +00:00
Makefile ep93xx: add support Vision EP9307 SoM 2011-10-17 11:22:11 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
micro9.c ARM: mach-ep93xx: convert boot_params to atag_offset 2011-08-21 17:14:46 -04:00
simone.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
snappercl15.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
ts72xx.c ARM: mach-ep93xx: convert boot_params to atag_offset 2011-08-21 17:14:46 -04:00
vision_ep9307.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00