linux/arch/arm/mach-davinci
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 ARM: 7142/1: davinci: mark GPIO implementation complex 2011-11-05 19:09:47 +00:00
aemif.c davinci: aemif: signedness bug in davinci_aemif_setup_timing() 2010-12-10 07:33:51 -08:00
board-da830-evm.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-da850-evm.c Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
board-dm355-evm.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-dm355-leopard.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-dm365-evm.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-dm644x-evm.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
board-dm646x-evm.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
board-mityomapl138.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-neuros-osd2.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-omapl138-hawk.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-sffsdr.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-tnetv107x-evm.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
cdce949.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
clock.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
clock.h Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
common.c ARM: mach-davinci: Setup consistent dma size at boot time 2011-08-22 12:00:11 +00:00
cp_intc.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
cpufreq.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
cpuidle.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
da830.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
da850.c Merge branch 'depends/rmk/gpio' into next/devel 2011-10-31 23:46:42 +01:00
devices-da8xx.c ARM: davinci: Explicitly set channel controllers' default queues 2011-09-17 15:54:08 +05:30
devices-tnetv107x.c ARM: davinci: Explicitly set channel controllers' default queues 2011-09-17 15:54:08 +05:30
devices.c davinci: make PCM platform devices static 2011-06-08 14:41:37 +05:30
dm355.c Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
dm365.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
dm644x.c Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
dm646x.c Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
dma.c ARM: davinci: edma: use kzalloc() 2011-09-17 15:54:09 +05:30
io.c Davinci: iotable based ioremap() interception 2010-05-13 10:05:31 -07:00
irq.c Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-19 22:10:05 -07:00
Kconfig ARM: davinci: AM18x: Add wl1271/wlan support 2011-09-17 15:53:23 +05:30
Makefile ARM: 7039/1: mach-davinci: move DaVinci TNET GPIO driver to GPIO subsystem 2011-08-22 09:12:55 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mux.c Davinci: pinmux - use ioremap() 2010-05-13 10:05:29 -07:00
mux.h Davinci: eliminate pinmux offset verbosity 2010-05-06 15:02:09 -07:00
pm.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
psc.c davinci: enable forced transitions on PSC 2011-07-08 11:10:09 +05:30
serial.c Davinci: serial - conditional reset via pwremu 2010-05-06 15:02:10 -07:00
sleep.S Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
sram.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
time.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
tnetv107x.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
usb.c DA8xx: assign name to MUSB IRQ resource 2010-12-11 12:15:53 +02:00