kevin/linux
1
Fork 0
Code
190a44e65b
linux/arch/arm/mach-at91
History
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
..
include/mach Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
at91cap9_devices.c ARM: at91/soc: use gpio_is_valid to check the gpio 2011-11-29 15:46:14 +00:00
at91cap9.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
at91rm9200_devices.c Merge branch 'at91/defconfig' into next/cleanup 2011-12-15 22:02:34 -08:00
at91rm9200_time.c ARM: at91: define CLOCK_TICK_RATE to bogus value except A91X40 2011-11-28 22:50:37 +08:00
at91rm9200.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
at91sam9_alt_reset.S ARM: restart: at91: use new restart hook 2012-01-05 12:57:08 +00:00
at91sam9g45_devices.c ARM: at91/soc: use gpio_is_valid to check the gpio 2011-11-29 15:46:14 +00:00
at91sam9g45.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
at91sam9rl_devices.c ARM: at91/soc: use gpio_is_valid to check the gpio 2011-11-29 15:46:14 +00:00
at91sam9rl.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
at91sam926x_time.c ARM: at91: make pit register base soc independent 2011-11-28 22:50:38 +08:00
at91sam9260_devices.c Merge branch 'at91/defconfig' into next/cleanup 2011-12-15 22:02:34 -08:00
at91sam9260.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
at91sam9261_devices.c Merge branch 'at91/defconfig' into next/cleanup 2011-12-15 22:02:34 -08:00
at91sam9261.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
at91sam9263_devices.c Merge branch 'at91/defconfig' into next/cleanup 2011-12-15 22:02:34 -08:00
at91sam9263.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
at91x40_time.c
at91x40.c at91: switch to CLKDEV_LOOKUP 2011-05-25 23:04:34 +08:00
board-1arm.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-afeb-9260v1.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-cam60.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-cap9adk.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-carmeva.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-cpu9krea.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-cpuat91.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-csb337.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-csb637.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-dt.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-eb01.c at91: fix map_io init usage 2011-05-25 23:04:34 +08:00
board-eb9200.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-ecbat91.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-eco920.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-flexibity.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-foxg20.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-gsia18s.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-kafa.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-kb9202.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-neocore926.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-pcontrol-g20.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-picotux200.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-qil-a9260.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-rm9200dk.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-rm9200ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-rsi-ews.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9-l9260.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9g20ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9m10g45ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9rlek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9260ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9261ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9263ek.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-snapper9260.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-stamp9g20.c arm/at91: fix build of stamp9g20 2011-12-21 13:57:43 -08:00
board-usb-a926x.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-yl-9200.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
clock.c at91: drop at572d940hf support 2011-05-25 23:04:35 +08:00
clock.h at91: switch to CLKDEV_LOOKUP 2011-05-25 23:04:34 +08:00
cpuidle.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2011-11-07 10:13:52 -08:00
generic.h Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
gpio.c ARM: at91/gpio: fix display of number of irq setuped 2011-11-29 15:46:19 +00:00
irq.c ARM: at91: make aic soc independent 2011-11-28 22:50:39 +08:00
Kconfig ARM: at91: make DBGU soc independent 2011-11-28 22:50:39 +08: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 Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 21:02:35 -07:00
Makefile.boot Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 21:02:35 -07:00
pm_slowclock.S AT91: pm: make sure that r0 is 0 when dealing with cache operations 2010-10-26 11:32:48 +02:00
pm.c ARM: at91: make aic soc independent 2011-11-28 22:50:39 +08:00
pm.h AT91: pm: make sure that r0 is 0 when dealing with cache operations 2010-10-26 11:32:48 +02:00
sam9_smc.c ARM: at91: make smc register base soc independent 2011-11-28 22:50:38 +08:00
sam9_smc.h ARM: at91: make smc register base soc independent 2011-11-28 22:50:38 +08:00
setup.c Merge branch 'picoxcell/cleanup' into next/cleanup 2011-12-19 21:13:41 -08:00
soc.h ARM: at91: add ioremap_registers entry point to soc setup 2011-11-28 22:50:38 +08:00