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
..
arm_timer.h	ARM: Improve documentation in arm_timer.h	2010-04-29 18:04:15 +01:00
cache-l2x0.h	ARM: 7114/1: cache-l2x0: add resume entry for l2 in secure mode	2011-10-17 09:11:51 +01:00
cache-tauros2.h
clps7111.h
coresight.h	ARM: 6293/1: coresight: cosmetic fixes	2010-10-04 20:20:44 +01:00
cs89712.h
debug-8250.S
debug-pl01x.S
dec21285.h
entry-macro-gic.S	ARM: gic: consolidate PPI handling	2011-10-23 13:32:29 +01:00
entry-macro-iomd.S
ep7211.h
ep7212.h
gic.h	Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable	2011-10-23 14:42:30 +01:00
icst.h	Update broken web addresses in arch directory.	2010-10-18 11:03:21 +02:00
ioc.h
iomd.h
iop3xx-adma.h
iop3xx-gpio.h	ARM: gpio: make trivial GPIOLIB implementation the default	2011-08-12 08:54:19 +01:00
iop3xx.h
iop_adma.h
it8152.h	PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.	2011-07-22 08:26:06 -07:00
linkup-l1110.h
locomo.h
memc.h
pci_v3.h
pl080.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
pl330.h	ARM: 6132/1: PL330: Add common core driver	2010-05-15 15:03:50 +01:00
sa1111.h
scoop.h	ARM: scoop: drop pcmcia_init callback	2011-07-11 14:43:32 +08:00
sp810.h	ARM: 6722/1: SPEAr: sp810: switch to slow mode before reset	2011-02-21 19:29:24 +00:00
ssp.h
timer-sp.h	clockevents: ARM sp804: allow clockevent name to be specified	2011-05-23 18:04:53 +01:00
uengine.h
vic.h