1
0
Fork 0
alistair23-linux/arch/arm/mach-msm/include/mach
David Brown 92c260f755 Merge remote branch 'rmk/for-linus' into for-linus
* rmk/for-linus: (1557 commits)
  ARM: 6806/1: irq: introduce entry and exit functions for chained handlers
  ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas
  ARM: 6747/1: P2V: Thumb2 support
  ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump
  ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode
  ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9
  ARM: 6772/1: errata: possible fault MMU translations following an ASID switch
  ARM: 6776/1: mach-ux500: activate fix for errata 753970
  ARM: 6794/1: SPEAr: Append UL to device address macros.
  ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files
  ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros
  ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code
  ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry
  ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci
  ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h
  ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files.
  ARM: 6681/1: SPEAr: add debugfs support to clk API
  ARM: 6703/1: SPEAr: update clk API support
  ARM: 6679/1: SPEAr: make clk API functions more generic
  ARM: 6737/1: SPEAr: formalized timer support
  ...

Conflicts:
	arch/arm/mach-msm/board-msm7x27.c
	arch/arm/mach-msm/board-msm7x30.c
	arch/arm/mach-msm/board-qsd8x50.c
	arch/arm/mach-msm/board-sapphire.c
	arch/arm/mach-msm/include/mach/memory.h
2011-03-16 22:13:16 -07:00
..
board.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
clk.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
clkdev.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
cpu.h msm: Add MSM 8960 cpu_is check 2011-01-21 15:27:53 -08:00
debug-macro.S msm: fix compile failure when no debug uart is selected 2010-10-29 15:56:16 -07:00
dma.h msm: dma: add stub functions for dma features not yet present on 8x60 2010-10-08 15:12:42 -07:00
entry-macro-qgic.S fix comment typos concerning "consistent" 2010-12-10 16:04:28 +01:00
entry-macro-vic.S msm: irq: rename existing entry-macro to entry-macro-vic 2010-10-08 15:12:38 -07:00
entry-macro.S msm: irq: rename existing entry-macro to entry-macro-vic 2010-10-08 15:12:38 -07:00
gpio.h msm: gpio: Remove tlmm routines obsoleted by gpiomux. 2010-10-06 09:01:17 -07:00
hardware.h
io.h msm: io: I/O register definitions for MSM8960 2011-01-21 15:27:51 -08:00
iommu.h msm: iommu: Remove dependency on IDR 2011-03-08 14:40:59 -08:00
iommu_hw-8xxx.h msm: iommu: Don't read from write-only registers 2011-03-08 14:42:30 -08:00
irqs-7x00.h msm: generialize IRQ to support multiple SOCs. 2010-05-13 16:07:53 -07:00
irqs-7x30.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
irqs-8x50.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
irqs-8x60.h msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU 2010-11-30 13:53:45 -08:00
irqs-8960.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
irqs.h msm: irqs-8960: Interrupt map for MSM8960 2011-01-21 15:27:52 -08:00
memory.h Merge remote branch 'rmk/for-linus' into for-linus 2011-03-16 22:13:16 -07:00
mmc.h mmc: msm_sdcc: Add gpio handling function to driver 2011-01-21 16:58:00 -08:00
msm_fb.h arm: msm: video: add msm_fb.h 2010-05-12 09:19:41 -07:00
msm_iomap-7x00.h msm: Clean up useless ifdefs 2011-01-28 11:28:23 -08:00
msm_iomap-7x30.h msm: Generalize timer register mappings 2011-01-21 15:27:50 -08:00
msm_iomap-8x50.h Merge branch 'msm-sdcc' into for-next 2011-01-24 15:42:46 -08:00
msm_iomap-8x60.h msm: iommu: Generalize platform data for multiple targets 2011-02-14 13:42:48 -08:00
msm_iomap-8960.h msm: io: I/O register definitions for MSM8960 2011-01-21 15:27:51 -08:00
msm_iomap.h msm: io: I/O register definitions for MSM8960 2011-01-21 15:27:51 -08:00
msm_smd.h arm: msm: smd: checkpatch clean up of smd/proc_comm 2010-05-12 09:15:39 -07:00
sirc.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
smp.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
system.h [ARM] msm: shared memory interface for baseband processor ipc 2010-05-12 09:14:52 -07:00
timex.h
uncompress.h msm: make debugging UART (for DEBUG_LL) configurable 2009-11-20 06:40:05 -08:00
vmalloc.h ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00
vreg.h arm: msm: status for vreg 2010-05-12 09:14:36 -07:00