leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16642a2e7b
linux/arch/arm/mach-mv78xx0
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 ARM: mv78xx0: use fixed pci i/o mapping 2012-07-26 09:10:03 -05:00
addr-map.c Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup 2012-09-12 22:34:11 -07:00
buffalo-wxl-setup.c ARM: restart: mv78xx0: use new restart hook 2012-01-05 12:57:15 +00:00
common.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
common.h New feature development 2012-01-09 14:38:51 -08:00
db78x00-bp-setup.c ARM: restart: mv78xx0: use new restart hook 2012-01-05 12:57:15 +00:00
irq.c ARM: orion: move custom gpio functions to orion-gpio.h 2012-09-14 09:21:59 -05:00
Kconfig
Makefile
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01: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
pcie.c ARM: mv78xx0: use fixed pci i/o mapping 2012-07-26 09:10:03 -05:00
rd78x00-masa-setup.c ARM: restart: mv78xx0: use new restart hook 2012-01-05 12:57:15 +00:00