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
..
barriers.h	ARM: 6870/1: The mandatory barrier rmb() must be a dsb() in for device accesses	2011-05-12 10:52:00 +01:00
board-eb.h	RealView: Move the IRQ_* definitions out of the board-*.h files	2009-05-30 14:00:17 +01:00
board-pb11mp.h	ARM: 5774/1: Fix Realview ARM1176PB board reboot	2009-11-01 14:19:34 +00:00
board-pb1176.h	ARM: 6217/4: mach-realview: expose PB1176 ROM using physmap and map_rom	2011-10-17 09:13:41 +01:00
board-pba8.h	RealView: Move the IRQ_* definitions out of the board-*.h files	2009-05-30 14:00:17 +01:00
board-pbx.h	RealView: Move the IRQ_* definitions out of the board-*.h files	2009-05-30 14:00:17 +01:00
clkdev.h	ARM: Indirect round/set_rate operations through clk structure	2010-05-02 09:35:38 +01: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	ARM: GIC: private a standard get_irqnr_preamble assembler macro	2010-12-14 19:21:47 +00:00
gpio.h	ARM: gpio: make trivial GPIOLIB implementation the default	2011-08-12 08:54:19 +01:00
hardware.h	nommu: Add MMU-less support for the RealView boards	2009-07-24 12:34:57 +01:00
io.h	[ARM] Add a common typesafe __io implementation	2008-11-30 11:45:54 +00:00
irqs-eb.h	RealView: Move the IRQ_* definitions out of the board-*.h files	2009-05-30 14:00:17 +01:00
irqs-pb11mp.h	RealView: Move the IRQ_* definitions out of the board-*.h files	2009-05-30 14:00:17 +01:00
irqs-pb1176.h	ARM: 6227/1: PL022 SSP platform data for the RealViews	2010-07-15 11:17:10 +01:00
irqs-pba8.h	ARM: 5890/1: Fix incorrect Realview board IRQs for L220 and PMU	2010-05-02 09:35:37 +01:00
irqs-pbx.h	ARM: 5890/1: Fix incorrect Realview board IRQs for L220 and PMU	2010-05-02 09:35:37 +01:00
irqs.h	RealView: Move the IRQ_* definitions out of the board-*.h files	2009-05-30 14:00:17 +01:00
memory.h	ARM: mach-realview: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size	2011-07-18 15:30:02 -04:00
platform.h	ARM: Realview/Versatile/Integrator: remove unused definitions from platform.h	2010-05-02 09:35:35 +01:00
system.h	ARM: realview: ensure visibility of writes during reset	2011-08-12 15:40:57 +01:00
timex.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
uncompress.h	RealView: Add support for the RealView/PBX platform	2009-05-30 13:56:12 +01:00
vmalloc.h	ARM: 5928/1: Change type of VMALLOC_END to unsigned long.	2010-02-15 21:40:33 +00:00