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: at91: move platform_data definitions

2012-09-14 11:16:40 +02:00

at91rm9200_devices.c

ARM: at91: sparse irq support

2012-07-02 14:26:59 +02:00

at91rm9200_time.c

ARM: at91: fix system timer irq issue due to sparse irq support

2012-08-23 14:55:32 +02:00

at91rm9200.c

ARM: at91: sparse irq support

2012-07-02 14:26:59 +02:00

at91sam9_alt_reset.S

ARM: at91: make sdram/ddr register base soc independent

2012-02-23 14:57:56 +01:00

at91sam9g45_devices.c

Merge branch 'multiplatform/platform-data' into next/multiplatform

2012-09-22 01:07:21 -07:00

at91sam9g45_reset.S

ARM: at91: make sdram/ddr register base soc independent

2012-02-23 14:57:56 +01:00

at91sam9g45.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2012-07-26 13:00:59 -07:00

at91sam9n12.c

ARM: at91: Add machine files for AT91SAM9N12 SoC

2012-04-28 01:40:11 +08:00

at91sam9rl_devices.c

Merge branch 'multiplatform/platform-data' into next/multiplatform

2012-09-22 01:07:21 -07:00

at91sam9rl.c

ARM: at91: sparse irq support

2012-07-02 14:26:59 +02:00

at91sam9x5.c

ARM: at91: remove static irq priorities for sam9x5

2012-07-02 14:26:58 +02:00

at91sam926x_time.c

ARM: at91: sparse irq support

2012-07-02 14:26:59 +02:00

at91sam9260_devices.c

ARM: at91: fix rtc-at91sam9 irq issue due to sparse irq support

2012-08-23 14:55:45 +02:00

at91sam9260.c

ARM: at91: sparse irq support

2012-07-02 14:26:59 +02:00

at91sam9261_devices.c

ARM: at91: fix rtc-at91sam9 irq issue due to sparse irq support

2012-08-23 14:55:45 +02:00

at91sam9261.c

ARM: at91: sparse irq support

2012-07-02 14:26:59 +02:00

at91sam9263_devices.c

ARM: at91: fix rtc-at91sam9 irq issue due to sparse irq support

2012-08-23 14:55:45 +02:00

at91sam9263.c

ARM: at91: sparse irq support

2012-07-02 14:26:59 +02:00

at91x40_time.c

ARM: at91/at91x40: remove use of at91_sys_read/write

2012-02-17 17:54:05 +01:00

at91x40.c

ARM: at91: fix new build errors

2012-07-04 13:56:48 +02:00

board-1arm.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-afeb-9260v1.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-cam60.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-carmeva.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-cpu9krea.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-cpuat91.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-csb337.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-csb637.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-dt.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-eb01.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-eb9200.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-ecbat91.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-eco920.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-flexibity.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-foxg20.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-gsia18s.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-kafa.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-kb9202.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-neocore926.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-pcontrol-g20.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-picotux200.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-qil-a9260.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-rm9200dk.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-rm9200ek.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-rsi-ews.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-sam9-l9260.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-sam9g20ek.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-sam9m10g45ek.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-sam9rlek.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-sam9260ek.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-sam9261ek.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-sam9263ek.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-snapper9260.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-stamp9g20.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-usb-a926x.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

board-yl-9200.c

ARM: at91: at91 based machines specify their own irq handler at run time

2012-07-02 14:26:58 +02:00

clock.c

ARM: at91/clock: fix PLLA overclock warning

2012-08-23 15:00:09 +02:00

clock.h

at91: switch to CLKDEV_LOOKUP

2011-05-25 23:04:34 +08:00

cpuidle.c

ARM: at91: pm select memory controler at runtime

2012-04-17 14:46:43 +02:00

generic.h

ARM: at91: add AIC5 support

2012-07-02 14:31:00 +02:00

gpio.c

ARM: at91: aic can use fast eoi handler type

2012-07-02 14:26:57 +02:00

irq.c

ARM: at91: fix new build errors

2012-07-04 13:56:48 +02:00

Kconfig

ARM: at91: fix new build errors

2012-07-04 13:56:48 +02:00

leds.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

Makefile

ARM: at91: Add machine files for AT91SAM9N12 SoC

2012-04-28 01:40:11 +08:00

Makefile.boot

ARM: move all dtb targets out of Makefile.boot

2012-09-14 09:22:04 -05:00

pm_slowclock.S

ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support

2012-04-17 14:47:21 +02:00

pm.c

ARM: at91: sparse irq support

2012-07-02 14:26:59 +02:00

pm.h

ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support

2012-04-17 14:47:21 +02:00

sam9_smc.c

ARM: at91: add accessor to manage SMC

2012-02-13 18:31:36 +01:00

sam9_smc.h

ARM: at91: add accessor to manage SMC

2012-02-13 18:31:36 +01:00

setup.c

Merge branch 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/newsoc

2012-05-02 17:21:21 +02:00

soc.h

ARM: at91: Add machine header file for AT91SAM9N12 SoC

2012-04-28 01:39:43 +08:00