linux/arch/arm/mach-mmp
Simon Horman 6265b0f325 Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc
Conflicts:
	arch/arm/mach-bcm/board_bcm.c
	arch/arm/mach-cns3xxx/cns3420vb.c
	arch/arm/mach-ep93xx/adssphere.c
	arch/arm/mach-ep93xx/edb93xx.c
	arch/arm/mach-ep93xx/gesbc9312.c
	arch/arm/mach-ep93xx/micro9.c
	arch/arm/mach-ep93xx/simone.c
	arch/arm/mach-ep93xx/snappercl15.c
	arch/arm/mach-ep93xx/ts72xx.c
	arch/arm/mach-ep93xx/vision_ep9307.c
	arch/arm/mach-highbank/highbank.c
	arch/arm/mach-imx/mach-imx6q.c
	arch/arm/mach-msm/board-dt-8960.c
	arch/arm/mach-netx/nxdb500.c
	arch/arm/mach-netx/nxdkn.c
	arch/arm/mach-netx/nxeb500hmi.c
	arch/arm/mach-nomadik/board-nhk8815.c
	arch/arm/mach-picoxcell/common.c
	arch/arm/mach-realview/realview_eb.c
	arch/arm/mach-realview/realview_pb1176.c
	arch/arm/mach-realview/realview_pb11mp.c
	arch/arm/mach-realview/realview_pba8.c
	arch/arm/mach-realview/realview_pbx.c
	arch/arm/mach-socfpga/socfpga.c
	arch/arm/mach-spear13xx/spear1310.c
	arch/arm/mach-spear13xx/spear1340.c
	arch/arm/mach-spear13xx/spear13xx.c
	arch/arm/mach-spear3xx/spear300.c
	arch/arm/mach-spear3xx/spear310.c
	arch/arm/mach-spear3xx/spear320.c
	arch/arm/mach-spear3xx/spear3xx.c
	arch/arm/mach-spear6xx/spear6xx.c
	arch/arm/mach-tegra/board-dt-tegra20.c
	arch/arm/mach-tegra/board-dt-tegra30.c
	arch/arm/mach-u300/core.c
	arch/arm/mach-ux500/board-mop500.c
	arch/arm/mach-ux500/cpu-db8500.c
	arch/arm/mach-versatile/versatile_ab.c
	arch/arm/mach-versatile/versatile_dt.c
	arch/arm/mach-versatile/versatile_pb.c
	arch/arm/mach-vexpress/v2m.c
	include/asm-generic/vmlinux.lds.h
2013-01-24 17:57:20 +09:00
..
include/mach ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Kconfig ARM: mmp: select pinctrl driver 2012-11-21 13:18:04 +08:00
Makefile ARM: mmp: move mmp2 clock definition to separated file 2012-09-08 23:38:19 +08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
aspenite.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
avengers_lite.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
brownstone.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
clock-mmp2.c ARM: mmp: move mmp2 clock definition to separated file 2012-09-08 23:38:19 +08:00
clock-pxa168.c arm: mmp: move pxa168 clock definition to separated file 2012-09-08 23:37:16 +08:00
clock-pxa910.c arm: mmp: move pxa910 clock definition to separated file 2012-09-08 23:37:51 +08:00
clock.c ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
clock.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
common.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
common.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
devices.c ARM: mmp: add usb host support for PXA168 2012-05-03 15:06:05 +08:00
flint.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
gplugd.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
irq.c ARM: mmp: using for_each_set_bit to simplify the code 2012-09-21 15:57:31 +08:00
jasper.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mmp-dt.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mmp2-dt.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mmp2.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pm-mmp2.c ARM: mmp: add PM support for mmp2 2012-05-07 11:35:00 +08:00
pm-pxa910.c ARM: mmp: add pm support for pxa910 2012-05-07 11:48:37 +08:00
pxa168.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pxa910.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
sram.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
tavorevb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
teton_bga.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
time.c ARM: mmp: support DT in timer 2012-05-05 16:36:01 +08:00
ttc_dkb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00