linux/arch/arm/mach-at91
Arnd Bergmann 442a33ebce Merge branch 'late/clksrc' into late/cleanup
There is no reason to keep the clksrc cleanups separate from the
other cleanups, and this resolves some merge conflicts.

Conflicts:
	arch/arm/mach-spear/spear13xx.c
	drivers/irqchip/Makefile
2013-05-06 23:43:45 +02:00
..
include/mach Little modification in SoC presentation in kernel log. 2013-04-19 11:51:24 -07:00
at91_aic.h arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
at91_rstc.h arm: at91: move reset controller header to arm/arm/mach-at91 2012-11-06 20:30:48 +08:00
at91_shdwc.h arm: at91: move at91_shdwc.h to arch/arm/mach-at91 2012-11-06 20:29:52 +08:00
at91_tc.h arn: at91: move at91_tc.h to arch/arm/mach-at91 2012-11-06 20:29:44 +08:00
at91rm9200_devices.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91rm9200_time.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
at91rm9200.c ARM: at91: change name template in AT91_SOC_START macro 2013-03-26 12:18:04 +01:00
at91sam9_alt_reset.S arm: at91: move reset controller header to arm/arm/mach-at91 2012-11-06 20:30:48 +08:00
at91sam9g45_devices.c ARM: at91/avr32/atmel_lcdfb: add platform device-id table 2013-03-13 11:05:12 +01:00
at91sam9g45_reset.S arm: at91: move reset controller header to arm/arm/mach-at91 2012-11-06 20:30:48 +08:00
at91sam9g45.c Merge branch 'late/clksrc' into late/cleanup 2013-05-06 23:43:45 +02:00
at91sam9n12.c ARM: at91: change name template in AT91_SOC_START macro 2013-03-26 12:18:04 +01:00
at91sam9rl_devices.c ARM: at91/avr32/atmel_lcdfb: add platform device-id table 2013-03-13 11:05:12 +01:00
at91sam9rl.c Merge branch 'late/clksrc' into late/cleanup 2013-05-06 23:43:45 +02:00
at91sam9x5.c ARM: at91: change name template in AT91_SOC_START macro 2013-03-26 12:18:04 +01:00
at91sam926x_time.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
at91sam9260_devices.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam9260.c ARM: at91: change name template in AT91_SOC_START macro 2013-03-26 12:18:04 +01:00
at91sam9261_devices.c ARM: at91/avr32/atmel_lcdfb: add platform device-id table 2013-03-13 11:05:12 +01:00
at91sam9261.c Merge branch 'late/clksrc' into late/cleanup 2013-05-06 23:43:45 +02:00
at91sam9263_devices.c ARM: at91/avr32/atmel_lcdfb: add platform device-id table 2013-03-13 11:05:12 +01:00
at91sam9263.c Merge branch 'late/clksrc' into late/cleanup 2013-05-06 23:43:45 +02:00
at91x40_time.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
at91x40.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-1arm.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-afeb-9260v1.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-cam60.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-carmeva.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-cpu9krea.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-cpuat91.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-csb337.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-csb637.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-dt-rm9200.c ARM: at91: renamme rm9200 dt file 2013-03-13 17:28:14 +01:00
board-dt-sam9.c ARM: at91: rename board-dt to more specific name board-dt-sam9 2013-03-13 17:18:00 +01:00
board-dt-sama5.c ARM: at91: introduce SAMA5 support 2013-03-26 12:18:04 +01:00
board-eb01.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-eb9200.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-ecbat91.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-eco920.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-flexibity.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-foxg20.c ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
board-gsia18s.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-kafa.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-kb9202.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-pcontrol-g20.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-picotux200.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-qil-a9260.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-rm9200dk.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-rm9200ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-rsi-ews.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9-l9260.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9g20ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9m10g45ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9rlek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9260ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9261ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9263ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-snapper9260.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-stamp9g20.c ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
board-usb-a926x.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-yl-9200.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board.h ARM: arm-soc: Header cleanups 2012-12-12 11:45:16 -08:00
clock.c ARM: at91: introduce SAMA5 support 2013-03-26 12:18:04 +01:00
clock.h ARM: at91: introduce SAMA5 support 2013-03-26 12:18:04 +01:00
cpuidle.c ARM: at91: suspend both memory controllers on at91sam9263 2013-04-18 16:31:02 +02:00
generic.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
gpio.c ARM: at91: add pinctrl support 2012-10-13 09:21:43 +08:00
gsia18s.h arm: at91: move board header to arch/arm/mach-at91 2012-11-06 20:29:48 +08:00
irq.c ARM: at91: fix infinite loop in at91_irq_suspend/resume 2013-03-14 09:37:55 +01:00
Kconfig ARM: at91: introduce SAMA5 support 2013-03-26 12:18:04 +01:00
Kconfig.non_dt ARM: at91: move non DT Kconfig to Kconfig.non_dt 2013-03-13 17:16:15 +01:00
leds.c arm: at91 move board.h to arch/arm/mach-at91 2012-11-06 20:29:37 +08:00
Makefile ARM: at91: introduce SAMA5 support 2013-03-26 12:18:04 +01: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 Little modification in SoC presentation in kernel log. 2013-04-19 11:51:24 -07:00
pm.h ARM: at91: suspend both memory controllers on at91sam9263 2013-04-18 16:31:02 +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
sama5d3.c ARM: at91: introduce SAMA5 support 2013-03-26 12:18:04 +01:00
setup.c ARM: at91: change "Unknown" qualifier SoC subtype handling 2013-04-09 14:26:56 +02:00
soc.h ARM: at91: introduce SAMA5 support 2013-03-26 12:18:04 +01:00
stamp9g20.h arm: at91: move board header to arch/arm/mach-at91 2012-11-06 20:29:48 +08:00