Linus Torvalds 1fdb24e969 Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm ... * 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits) ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET ARM: gic, local timers: use the request_percpu_irq() interface ARM: gic: consolidate PPI handling ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H ARM: mach-s5p64x0: remove mach/memory.h ARM: mach-s3c64xx: remove mach/memory.h ARM: plat-mxc: remove mach/memory.h ARM: mach-prima2: remove mach/memory.h ARM: mach-zynq: remove mach/memory.h ARM: mach-bcmring: remove mach/memory.h ARM: mach-davinci: remove mach/memory.h ARM: mach-pxa: remove mach/memory.h ARM: mach-ixp4xx: remove mach/memory.h ARM: mach-h720x: remove mach/memory.h ARM: mach-vt8500: remove mach/memory.h ARM: mach-s5pc100: remove mach/memory.h ARM: mach-tegra: remove mach/memory.h ARM: plat-tcc: remove mach/memory.h ARM: mach-mmp: remove mach/memory.h ARM: mach-cns3xxx: remove mach/memory.h ... Fix up mostly pretty trivial conflicts in: - arch/arm/Kconfig - arch/arm/include/asm/localtimer.h - arch/arm/kernel/Makefile - arch/arm/mach-shmobile/board-ap4evb.c - arch/arm/mach-u300/core.c - arch/arm/mm/dma-mapping.c - arch/arm/mm/proc-v7.S - arch/arm/plat-omap/Kconfig largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -> CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and addition of NEED_MACH_MEMORY_H next to HAVE_IDE.		2011-10-28 12:02:27 -07:00
..
at_hdmac.h
at91_adc.h
at91_aic.h
at91_dbgu.h	at91: remove AT91_DBGU offset from dbgu register macro	2011-07-28 15:07:28 +00:00
at91_pio.h
at91_pit.h
at91_pmc.h
at91_rstc.h
at91_rtc.h
at91_rtt.h
at91_shdwc.h
at91_spi.h
at91_ssc.h
at91_st.h
at91_tc.h
at91_twi.h
at91cap9_ddrsdr.h
at91cap9_matrix.h
at91cap9.h	at91: introduce commom AT91_BASE_SYS	2011-07-28 15:07:28 +00:00
at91rm9200_emac.h
at91rm9200_mc.h
at91rm9200.h	at91: introduce commom AT91_BASE_SYS	2011-07-28 15:07:28 +00:00
at91sam9_ddrsdr.h
at91sam9_sdramc.h
at91sam9_smc.h
at91sam9g45_matrix.h
at91sam9g45.h	ARM: mach-at91: Setup consistent dma size at boot time	2011-08-22 12:00:11 +00:00
at91sam9rl_matrix.h
at91sam9rl.h	at91: introduce commom AT91_BASE_SYS	2011-07-28 15:07:28 +00:00
at91sam9260_matrix.h
at91sam9260.h	at91: introduce commom AT91_BASE_SYS	2011-07-28 15:07:28 +00:00
at91sam9261_matrix.h
at91sam9261.h	at91: introduce commom AT91_BASE_SYS	2011-07-28 15:07:28 +00:00
at91sam9263_matrix.h
at91sam9263.h	at91: introduce commom AT91_BASE_SYS	2011-07-28 15:07:28 +00:00
at91x40.h	at91: factorize common irq ID	2011-05-25 23:04:34 +08:00
atmel-mci.h
board.h	at91: drop at572d940hf support	2011-05-25 23:04:35 +08:00
cpu.h	at91: use structure to store the current soc	2011-07-28 15:07:28 +00:00
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
entry-macro.S
gpio.h	ARM: gpio: make trivial GPIOLIB implementation the default	2011-08-12 08:54:19 +01:00
gsia18s.h
hardware.h	at91: introduce commom AT91_BASE_SYS	2011-07-28 15:07:28 +00:00
io.h	at91: add arch specific ioremap support	2011-07-28 15:09:26 +00:00
irqs.h
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_rev.h	AT91: Change nand buswidth logic to match hardware default configuration	2011-07-04 23:22:25 +02:00
system.h
timex.h	at91: drop at572d940hf support	2011-05-25 23:04:35 +08:00
uncompress.h
vmalloc.h