linux/arch/arm/common
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
..
dmabounce.c ARM: dmabounce: get rid of dma_needs_bounce global function 2011-07-04 08:39:55 +01:00
gic.c Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 21:02:35 -07:00
icst.c
it8152.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
Kconfig ARM: gic: add irq_domain support 2011-10-31 14:03:24 +01:00
locomo.c
Makefile ARM: 6872/1: arch:common:Makefile Remove unused config in the Makefile. 2011-04-10 21:13:37 +01:00
pl330.c ARM: 7136/1: pl330: Fix a race condition 2011-10-22 22:11:23 +01:00
sa1111.c clk: sa1111: convert to clk_prepare()/clk_unprepare() 2011-09-27 09:25:53 +01:00
scoop.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
sharpsl_param.c
time-acorn.c
timer-sp.c clk: timer-sp: convert to clk_prepare()/clk_unprepare() 2011-09-27 09:25:53 +01:00
uengine.c
via82c505.c
vic.c Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus 2011-10-25 08:19:29 +01:00