p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/arch/arm/mach-kirkwood
History
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform 
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
 		2012-09-22 01:07:21 -07:00
..
include/mach Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
Kconfig ARM: kirkwood: Add LS-XHL and LS-CHLv2 support 2012-07-27 16:49:10 +02:00
Makefile ARM: kirkwood: Add LS-XHL and LS-CHLv2 support 2012-07-27 16:49:10 +02:00
Makefile.boot ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
addr-map.c ARM: Orion: mbus_dram_info consolidation 2011-12-13 18:46:55 -05:00
board-dnskw.c ARM: Kirkwood: Describe DNS32? gpio-keys in DT. 2012-07-27 16:50:02 +02:00
board-dreamplug.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
board-dt.c ARM: Kirkwood: Replace mrvl with marvell 2012-07-27 16:50:57 +02:00
board-goflexnet.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
board-ib62x0.c ARM: Kirkwood: Describe IB62x0 LEDs in DT. 2012-07-27 16:50:18 +02:00
board-iconnect.c ARM: Kirkwood: Describe iConnects LEDs in DT. 2012-07-27 16:50:33 +02:00
board-lsxl.c ARM: kirkwood: Add LS-XHL and LS-CHLv2 support 2012-07-27 16:49:10 +02:00
board-ts219.c ARM: Kirkwood: Use DT to configure SATA device. 2012-07-27 16:49:29 +02:00
common.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
common.h ARM: kirkwood: Add LS-XHL and LS-CHLv2 support 2012-07-27 16:49:10 +02:00
cpuidle.c ARM: kirkwood: Consolidate time keeping and irq enable 2012-03-21 02:00:25 -04:00
d2net_v2-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
db88f6281-bp-setup.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
dockstar-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
guruplug-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
irq.c ARM: orion: move custom gpio functions to orion-gpio.h 2012-09-14 09:21:59 -05:00
lacie_v2-common.c [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
lacie_v2-common.h [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
mpp.c ARM: Orion: Get address map from plat-orion instead of via platform_data 2011-12-13 18:46:55 -05: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: Orion: SPI: Add clk/clkdev support. 2012-05-08 16:33:55 -07:00
netspace_v2-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
netxbig_v2-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
openrd-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
pcie.c ARM: kirkwood: use fixed PCI i/o mapping 2012-07-26 09:10:01 -05:00
rd88f6192-nas-setup.c ARM: orion: move custom gpio functions to orion-gpio.h 2012-09-14 09:21:59 -05:00
rd88f6281-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
sheevaplug-setup.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
t5325-setup.c ARM: Orion: SPI: Add clk/clkdev support. 2012-05-08 16:33:55 -07:00
ts41x-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
ts219-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
tsx1x-common.c ARM: Orion: SPI: Add clk/clkdev support. 2012-05-08 16:33:55 -07:00
tsx1x-common.h ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text 2010-07-26 10:33:08 +01:00