kernel-fxtec-pro1x/arch/arm/mach-at91
Russell King f779b7dd32 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
	arch/arm/mach-at91/include/mach/system.h
	arch/arm/mach-imx/mach-cpuimx27.c

AT91 conflict resolution:
Acked-by: Anders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.
2010-10-19 20:12:24 +01:00
..
include/mach Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-19 20:12:24 +01:00
at91cap9.c
at91cap9_devices.c
at91rm9200.c
at91rm9200_devices.c
at91rm9200_time.c arm/at91: Don't disable irqs in set_next_event and set_mode callbacks 2010-01-22 17:04:39 +01:00
at91sam9g45.c AT91: SAM9G45 - add a separate clock entry for every single TC block 2010-09-09 20:14:43 +02:00
at91sam9g45_devices.c ARM: 6406/1: at91sam9g45: fix i2c bus speed 2010-09-23 15:08:48 +01:00
at91sam9rl.c
at91sam9rl_devices.c AT91: add platform parameters for atmel_tsadcc in at91sam9rlek 2009-11-20 00:55:29 -08:00
at91sam926x_time.c arm/at91: Don't disable irqs in set_next_event and set_mode callbacks 2010-01-22 17:04:39 +01:00
at91sam9260.c
at91sam9260_devices.c AT91: atmel-mci: Platform configuration to the the atmel-mci driver 2009-09-23 07:39:37 -07:00
at91sam9261.c
at91sam9261_devices.c
at91sam9263.c
at91sam9263_devices.c Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2009-09-24 15:13:11 -07:00
at91x40.c
at91x40_time.c
at572d940hf.c ARM: 5850/1: [AT91] AT572D940HF processor support 2010-01-20 12:34:06 +00:00
at572d940hf_devices.c ARM: 5850/1: [AT91] AT572D940HF processor support 2010-01-20 12:34:06 +00:00
board-1arm.c
board-afeb-9260v1.c
board-at572d940hf_ek.c AT91: Correct configuration define value 2010-10-07 19:56:30 +02:00
board-cam60.c ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions} 2010-08-10 22:46:56 +01:00
board-cap9adk.c
board-carmeva.c
board-cpu9krea.c
board-cpuat91.c
board-csb337.c
board-csb637.c
board-dk.c
board-eb01.c
board-eb9200.c
board-ecbat91.c
board-eco920.c ARM: 5782/1: at91: support for eco920 2009-11-10 23:46:35 +00:00
board-ek.c
board-kafa.c
board-kb9202.c
board-neocore926.c Merge branch 'origin' into for-linus 2009-09-24 21:22:33 +01:00
board-picotux200.c
board-qil-a9260.c
board-sam9-l9260.c
board-sam9g20ek.c AT91: at91sam9g20ek: merge 2mmc version in one board 2010-10-07 19:56:31 +02:00
board-sam9m10g45ek.c AT91: Correct configuration define value 2010-10-07 19:56:30 +02:00
board-sam9rlek.c AT91: add platform parameters for atmel_tsadcc in at91sam9rlek 2009-11-20 00:55:29 -08:00
board-sam9260ek.c
board-sam9261ek.c AT91: at91sam9261ek: remove C99 comments but keep information 2010-09-10 14:36:06 +02:00
board-sam9263ek.c Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2009-09-24 15:13:11 -07:00
board-snapper9260.c ARM: 6209/2: at91: Add support for Bluewater Systems Snapper 9260/9G20 modules 2010-07-09 12:31:52 +01:00
board-stamp9g20.c ARM: 6054/1: AT91: taskit PortuxG20 and Stamp9G20 board support 2010-04-14 11:24:53 +01:00
board-usb-a9260.c
board-usb-a9263.c
board-yl-9200.c
clock.c AT91: clock: peripheral clocks can have other parent than mck 2010-09-09 20:13:23 +02:00
clock.h ARM: 5850/1: [AT91] AT572D940HF processor support 2010-01-20 12:34:06 +00:00
cpuidle.c ARM: 5778/1: AT91: Add cpuidle support 2009-11-10 23:46:35 +00:00
generic.h ARM: 5850/1: [AT91] AT572D940HF processor support 2010-01-20 12:34:06 +00:00
gpio.c
irq.c
Kconfig net: atmel_macb Kconfig: remove long dependency line 2010-10-07 19:56:55 +02:00
leds.c
Makefile AT91: at91sam9g20ek: merge 2mmc version in one board 2010-10-07 19:56:31 +02:00
Makefile.boot
pm.c ARM: 5778/1: AT91: Add cpuidle support 2009-11-10 23:46:35 +00:00
pm.h ARM: 6185/1: AT91: PM: dual ram controller support 2010-07-09 12:31:50 +01:00
pm_slowclock.S ARM: 6185/1: AT91: PM: dual ram controller support 2010-07-09 12:31:50 +01:00
sam9_smc.c
sam9_smc.h