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
..
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
enp2611.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
entry-macro.S	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
gpio-ixp2000.h	ARM: 7043/1: mach-ixp2000: rename GPIO header	2011-08-22 09:13:21 +01:00
hardware.h	ARM: convert PCI defines to variables	2011-07-12 11:19:29 -05:00
io.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
irqs.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
ixdp2x00.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
ixdp2x01.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
ixp2000-regs.h	[ARM] Remove MT_DEVICE_IXP2000 and associated definitions	2008-10-01 16:41:06 +01:00
memory.h	ARM: P2V: separate PHYS_OFFSET from platform definitions	2011-02-17 23:26:55 +00:00
platform.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
system.h	[ARM] pass reboot command line to arch_reset()	2009-03-19 16:20:24 +00:00
timex.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
uncompress.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
vmalloc.h	ARM: 5928/1: Change type of VMALLOC_END to unsigned long.	2010-02-15 21:40:33 +00:00