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
..
assabet.h	Nicolas Pitre has a new email address	2009-09-15 09:37:12 -07:00
badge4.h
bitfield.h
cerf.h
collie.h	[ARM] sa1100: remove unreferenced IRQ definitions	2010-03-02 07:40:49 +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
dma.h
entry-macro.S
gpio.h	ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function	2011-08-22 09:13:45 +01:00
h3xxx.h	ARM: 5821/1: SA1100: h3100/h3600: revise copyright boilerplates	2009-12-06 16:52:56 +00:00
hardware.h	ARM: convert PCI defines to variables	2011-07-12 11:19:29 -05:00
io.h	ARM: io: remove IO_SPACE_LIMIT from SA11x0	2011-08-17 08:44:17 +01:00
irqs.h	[ARM] pxa: replacing dead SHARPSL_LOCOMO with SHARP_LOCOMO	2010-08-05 14:32:29 +08:00
jornada720.h	[ARM] 5255/1: Update jornada ssp to remove build errors/warnings	2008-09-18 12:29:09 +01:00
lart.h
mcp.h	add gpiolib support to ucb1x00	2009-11-27 21:07:21 +01:00
memory.h	ARM: mach-sa1100: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size	2011-07-18 15:30:03 -04:00
mtd-xip.h	[ARM] move asm/xip.h's mach/hardware.h include to mach/xip.h	2008-12-14 13:22:51 +00:00
nanoengine.h	ARM: 6459/2: sa1100: Add nanoEngine PCI support.	2010-12-21 14:53:46 +00:00
neponset.h	Nicolas Pitre has a new email address	2009-09-15 09:37:12 -07:00
reset.h	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6	2008-08-07 11:06:47 +01:00
SA-1100.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
SA-1101.h
SA-1111.h
shannon.h
simpad.h	ARM: 7024/1: simpad: Cleanup CS3 accessors.	2011-10-17 09:12:42 +01:00
system.h	Nicolas Pitre has a new email address	2009-09-15 09:37:12 -07:00
timex.h
uncompress.h	Nicolas Pitre has a new email address	2009-09-15 09:37:12 -07:00
vmalloc.h	ARM: 5928/1: Change type of VMALLOC_END to unsigned long.	2010-02-15 21:40:33 +00:00