linux/arch/arm/mach-msm
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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 2011-10-28 14:16:11 -07:00
acpuclock-arm11.c Fix common misspellings 2011-03-31 11:26:23 -03:00
acpuclock.h
board-halibut.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-mahimahi.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-msm7x27.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-msm7x30.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-msm8x60.c Merge branch 'dt/gic' into next/dt 2011-10-31 14:08:10 +01:00
board-msm8960.c ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs 2011-08-13 11:26:18 +01:00
board-qsd8x50.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-sapphire.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-trout-gpio.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
board-trout-mmc.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-trout-panel.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-trout.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-trout.h
clock-7x30.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
clock-debug.c msm: clock: Remove references to clk_ops_pcom 2011-02-28 12:40:05 -08:00
clock-pcom.c msm: clock: Remove references to clk_ops_pcom 2011-02-28 12:40:05 -08:00
clock-pcom.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
clock.c PM QoS: Move and rename the implementation files 2011-08-25 15:35:03 +02:00
clock.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
devices-iommu.c msm: iommu: Remove dependency on IDR 2011-03-08 14:40:59 -08:00
devices-msm7x00.c msm: mmc: Remove "pio_irq" resource 2011-10-26 15:43:37 -04:00
devices-msm7x30.c msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
devices-msm8960.c msm: serial: Add MSM8960 serial support 2011-01-28 12:27:21 -08:00
devices-qsd8x50.c msm: mmc: Remove "pio_irq" resource 2011-10-26 15:43:37 -04:00
devices.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
dma.c
gpiomux-8x50.c msm: 8x50: Add initial support for SDCC 2011-01-21 16:58:02 -08:00
gpiomux-8x60.c
gpiomux-v1.c
gpiomux-v1.h
gpiomux-v2.c
gpiomux-v2.h
gpiomux.c
gpiomux.h msm: gpiomux: Move public API to public header 2011-08-01 04:58:00 -07:00
headsmp.S msm: headsmp.S: Fix section mismatch 2011-02-28 12:40:05 -08:00
hotplug.c ARM: msm: convert logical CPU numbers to physical numbers 2011-10-17 10:01:11 +01:00
idle.S
io.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
irq-vic.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
Kconfig Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next 2011-08-01 15:16:05 +01:00
last_radio_log.c
Makefile Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next 2011-08-01 15:16:05 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
platsmp.c Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:34:22 -07:00
proc_comm.c
proc_comm.h
scm-boot.c msm: scm-boot: Support for setting cold/warm boot addresses 2011-01-07 15:54:43 -08:00
scm-boot.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
scm.c Fix common misspellings 2011-03-31 11:26:23 -03:00
scm.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
sirc.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
smd_debug.c
smd_private.h
smd.c
timer.c ARM: gic, local timers: use the request_percpu_irq() interface 2011-10-23 13:32:33 +01:00
vreg.c