openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm/mach-msm/include/mach
History
Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup 
Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-exynos/cpu.c
	arch/arm/mach-shmobile/board-kota2.c

This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 		2012-01-07 11:51:28 +00: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
cpu.h msm: Add MSM 8960 cpu_is check 2011-01-21 15:27:53 -08:00
debug-macro.S msm: Support DEBUG_LL on MSM8660 and MSM8960 2011-11-10 10:17:06 -08: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.S ARM: msm: convert SMP platforms to CONFIG_MULTI_IRQ_HANDLER 2011-11-15 18:14:00 +00:00
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
hardware.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
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
mmc.h msm: Implement init_card operation for MSM SDCC 2011-10-26 15:43:36 -04:00
msm_fb.h arm: msm: video: add msm_fb.h 2010-05-12 09:19:41 -07:00
msm_gpiomux.h msm: gpiomux: Move public API to public header 2011-08-01 04:58:00 -07:00
msm_iomap-7x00.h ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice 2011-11-10 10:17:06 -08:00
msm_iomap-7x30.h ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice 2011-11-10 10:17:06 -08:00
msm_iomap-8x50.h ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice 2011-11-10 10:17:06 -08:00
msm_iomap-8x60.h msm: Support DEBUG_LL on MSM8660 and MSM8960 2011-11-10 10:17:06 -08:00
msm_iomap-8960.h msm: Support DEBUG_LL on MSM8660 and MSM8960 2011-11-10 10:17:06 -08:00
msm_iomap.h ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice 2011-11-10 10:17:06 -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
system.h ARM: restart: remove the now empty arch_reset() 2012-01-05 12:57:22 +00:00
timex.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
uncompress.h msm: Support DEBUG_LL on MSM8660 and MSM8960 2011-11-10 10:17:06 -08:00
vreg.h arm: msm: status for vreg 2010-05-12 09:14:36 -07:00