Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup ... Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9260.c arch/arm/mach-at91/at91sam9261.c arch/arm/mach-at91/at91sam9263.c arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-at91/at91sam9rl.c arch/arm/mach-exynos/cpu.c arch/arm/mach-shmobile/board-kota2.c This resolves a bunch of conflicts between the arm-soc tree and changes from the arm tree that have gone upstream. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 11:51:28 +00:00
..
at91_adc.h
at91_aic.h	ARM: at91: make aic soc independent	2011-11-28 22:50:39 +08:00
at91_dbgu.h	ARM: at91: make DBGU soc independent	2011-11-28 22:50:39 +08:00
at91_pio.h
at91_pit.h	ARM: at91: make pit register base soc independent	2011-11-28 22:50:38 +08:00
at91_pmc.h
at91_rstc.h
at91_rtc.h	ARM: at91: make rm9200 rtc drivers soc independent	2011-11-28 22:50:39 +08:00
at91_rtt.h
at91_shdwc.h	ARM: at91: make shutdown controler soc independent	2011-11-28 22:50:38 +08:00
at91_spi.h
at91_ssc.h
at91_st.h
at91_tc.h
at91_twi.h
at91cap9.h	ARM: at91: make aic soc independent	2011-11-28 22:50:39 +08:00
at91cap9_ddrsdr.h	ARM: 6185/1: AT91: PM: dual ram controller support	2010-07-09 12:31:50 +01:00
at91cap9_matrix.h
at91rm9200.h	ARM: at91: make rm9200 rtc drivers soc independent	2011-11-28 22:50:39 +08:00
at91rm9200_emac.h
at91rm9200_mc.h
at91sam9_ddrsdr.h	ARM: 6185/1: AT91: PM: dual ram controller support	2010-07-09 12:31:50 +01:00
at91sam9_sdramc.h	ARM: 6185/1: AT91: PM: dual ram controller support	2010-07-09 12:31:50 +01:00
at91sam9_smc.h	ARM: at91: make smc register base soc independent	2011-11-28 22:50:38 +08:00
at91sam9g45.h	ARM: at91: make rm9200 rtc drivers soc independent	2011-11-28 22:50:39 +08:00
at91sam9g45_matrix.h
at91sam9rl.h	ARM: at91: make rm9200 rtc drivers soc independent	2011-11-28 22:50:39 +08:00
at91sam9rl_matrix.h
at91sam9260.h	ARM: at91: make aic soc independent	2011-11-28 22:50:39 +08:00
at91sam9260_matrix.h
at91sam9261.h	ARM: at91: make aic soc independent	2011-11-28 22:50:39 +08:00
at91sam9261_matrix.h
at91sam9263.h	ARM: at91: make aic soc independent	2011-11-28 22:50:39 +08:00
at91sam9263_matrix.h
at91x40.h	ARM: at91: make aic soc independent	2011-11-28 22:50:39 +08:00
at_hdmac.h
atmel-mci.h
board.h	ARM: at91/boards: use -EINVAL for invalid gpio	2011-11-29 15:46:14 +00:00
cpu.h	at91: use structure to store the current soc	2011-07-28 15:07:28 +00:00
debug-macro.S	ARM: at91: make DBGU soc independent	2011-11-28 22:50:39 +08:00
entry-macro.S	ARM: at91: make aic soc independent	2011-11-28 22:50:39 +08:00
gpio.h	ARM: at91/gpio: drop PIN_BASE	2011-11-29 15:46:18 +00:00
gsia18s.h	AT91: Support for gsia18s board	2011-01-14 19:49:04 +01:00
hardware.h	ARM: at91: make aic soc independent	2011-11-28 22:50:39 +08:00
io.h	ARM: mach-at91: remove arch specific special handling for ioremap	2011-11-15 22:30:39 -05:00
irqs.h	ARM: at91: make aic soc independent	2011-11-28 22:50:39 +08:00
memory.h	at91: drop boot_params and PLAT_PHYS_OFFSET	2011-05-25 23:04:35 +08:00
stamp9g20.h	at91: fix map_io init usage	2011-05-25 23:04:34 +08:00
system.h	ARM: restart: remove the now empty arch_reset()	2012-01-05 12:57:22 +00:00
system_rev.h	ARM: at91: fix NAND bus width decoding from system_rev	2011-11-28 12:10:34 +01:00
timex.h	ARM: at91: define CLOCK_TICK_RATE to bogus value except A91X40	2011-11-28 22:50:37 +08:00
uncompress.h	ARM: at91: make DBGU soc independent	2011-11-28 22:50:39 +08:00