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
..
addr-map.h	[ARM] pxa: add base support for Marvell's PXA168 processor line	2009-03-23 10:11:34 +08:00
cputype.h	ARM: mmp: fix cpuid detection on mmp2	2010-11-03 23:11:16 +08: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
devices.h	[ARM] mmp: avoid devices.h being included multiple times	2010-08-05 14:34:45 +08:00
dma.h	[ARM] pxa: add base support for Marvell's PXA168 processor line	2009-03-23 10:11:34 +08:00
entry-macro.S	[ARM] mmp: add support for Marvell MMP2	2010-03-02 07:40:55 +08:00
gpio-pxa.h	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	2011-10-01 23:45:34 +01:00
gpio.h	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	2011-10-01 23:45:34 +01:00
hardware.h	[ARM] pxa: add base support for Marvell's PXA168 processor line	2009-03-23 10:11:34 +08:00
io.h	[ARM] pxa: add base support for Marvell's PXA168 processor line	2009-03-23 10:11:34 +08:00
irqs.h	ARM: mmp: support sparse irq	2010-10-09 17:07:25 +08:00
mfp-mmp2.h	ARM: mmp: MMP2 drive strength FAST using wrong value	2011-01-15 04:29:19 -06:00
mfp-pxa168.h	ARM: pxa168/gplugd: get rid of mfp-gplugd.h	2011-08-11 10:10:43 +08:00
mfp-pxa910.h	ARM: mmp: PXA910 drive strength FAST using wrong value	2011-01-15 04:29:20 -06:00
mfp.h	[ARM] pxa: fix the incorrectly defined drive strength macros for pxa{168,910}	2009-05-22 18:15:31 +08:00
mmp2.h	mmc: sdhci-pxa: move platform data to include/linux/platform_data	2011-07-20 17:20:52 -04:00
pxa168.h	USB: pxa168: Add onchip USB host controller support	2011-08-22 15:38:30 -07:00
pxa910.h	ARM: pxa2xx: reorganize I2C files	2011-03-21 09:09:33 +00:00
regs-apbc.h	[ARM] mmp: support ssp in pxa168	2010-05-11 17:24:59 +02:00
regs-apmu.h	ARM: pxa168: Add support for Ethernet	2011-07-12 19:50:36 +08:00
regs-icu.h	[ARM] mmp2: add missing ICU register definitions	2010-03-02 07:40:57 +08:00
regs-smc.h	[ARM] mmp: add smc registers definition	2010-05-11 17:25:06 +02:00
regs-timers.h	[ARM] pxa: add base support for Marvell's PXA168 processor line	2009-03-23 10:11:34 +08:00
system.h	ARM: pxa168: fix corrected reset vector	2010-09-25 09:47:03 +08:00
teton_bga.h	ARM: pxa168: added support for Teton BGA platform	2010-10-09 17:07:26 +08:00
timex.h	[ARM] mmp: fix clock tick rate in mmp2	2010-05-11 17:25:05 +02:00
uncompress.h	ARM: zImage: remove the static qualifier from global data variables	2011-05-07 00:08:02 -04:00
vmalloc.h	ARM: 5928/1: Change type of VMALLOC_END to unsigned long.	2010-02-15 21:40:33 +00:00