2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
linux-next/arch/arm/mach-kirkwood
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 Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 2012-09-22 14:22:47 -07:00
addr-map.c arm: plat-orion: use void __iomem pointers for addr-map functions 2012-09-21 18:04:47 +00:00
board-dnskw.c ARM: Kirkwood: Convert dnskw to pinctrl 2012-11-24 02:57:56 +00:00
board-dockstar.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-dreamplug.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-dt.c Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
board-goflexnet.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-ib62x0.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-iconnect.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-iomega_ix2_200.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-km_kirkwood.c ARM: Kirkwood: Convert km_kirkwood to pinctrl 2012-11-24 02:58:48 +00:00
board-lsxl.c ARM: arm-soc: Board updates for 3.8 2012-12-12 12:14:06 -08:00
board-mplcec4.c ARM: Kirkwood: remove kirkwood_ehci_init() from new boards 2012-11-24 03:58:12 +00:00
board-ns2.c ARM: Kirkwood: remove kirkwood_ehci_init() from new boards 2012-11-24 03:58:12 +00:00
board-nsa310.c ARM: Kirkwood: remove kirkwood_ehci_init() from new boards 2012-11-24 03:58:12 +00:00
board-openblocks_a6.c ARM: Kirkwood: Add support LED of OpenBlocks A6 2012-11-24 02:59:12 +00:00
board-ts219.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-usi_topkick.c ARM: Kirkwood: Use fixed-regulator instead of board gpio call 2013-01-06 17:53:10 +00:00
common.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
common.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
cpuidle.c ARM: Kirkwood: checkpatch cleanups 2012-11-19 03:53:54 +00:00
d2net_v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
db88f6281-bp-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
dockstar-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
guruplug-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
irq.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
Kconfig ARM: arm-soc: Updates for Marvell mvebu/kirkwood 2012-12-14 14:54:26 -08:00
lacie_v2-common.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
lacie_v2-common.h [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
Makefile ARM: kirkwood: Add Plat'Home OpenBlocks A6 support 2012-11-22 07:01:51 +00:00
Makefile.boot ARM: kirkwood: move new dtbs to common Makefile 2012-09-22 14:24:00 -07:00
mpp.c ARM: Kirkwood: checkpatch cleanups 2012-11-19 03:53:54 +00:00
mpp.h ARM: orion: Fix Orion5x GPIO regression from MPP cleanup 2012-02-09 16:16:31 -08:00
mv88f6281gtw_ge-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
netspace_v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
netxbig_v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
openrd-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pcie.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
rd88f6192-nas-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
rd88f6281-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
sheevaplug-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
t5325-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ts41x-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ts219-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
tsx1x-common.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
tsx1x-common.h ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text 2010-07-26 10:33:08 +01:00