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
..
clkdev.h	ARM: SAMSUNG: Added mach/clkdev.h	2011-07-21 02:04:14 +09: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	ARM: S5P64X0: Move DMA support for S5P64X0	2010-10-18 18:33:03 +09:00
entry-macro.S
gpio.h	ARM: gpio: make trivial GPIOLIB implementation the default	2011-08-12 08:54:19 +01:00
hardware.h
i2c.h	ARM: S5P64X0: Add S5P6450 I2C support	2010-10-18 18:33:03 +09:00
io.h
irqs.h	ARM: SAMSUNG: Add IRQ_I2S0 definition	2011-07-21 17:27:28 +09:00
map.h	ARM: S5P64X0: Cleanup map.h file	2011-02-17 12:52:52 +09:00
pwm-clock.h	ARM: S5P64X0: Update Timer support	2010-10-18 18:33:03 +09:00
regs-clock.h	ARM: S5P: Reduce duplicated EPLL control codes	2010-10-25 16:05:56 +09:00
regs-gpio.h	ARM: S5P64X0: External Interrupt Support	2011-07-21 17:29:29 +09:00
regs-irq.h	ARM: S5P64X0: Update IRQ support	2010-10-18 18:33:03 +09:00
s5p64x0-clock.h
spi-clocks.h	ARM: S5P64X0: Update Audio support	2010-10-18 18:33:03 +09:00
system.h
tick.h	ARM: S5P64X0: Update Timer support	2010-10-18 18:33:03 +09:00
timex.h
uncompress.h	ARM: zImage: remove the static qualifier from global data variables	2011-05-07 00:08:02 -04:00
vmalloc.h	ARM: S5P: Change VMALLOC_END to use more vmalloc()/ioremap() area	2010-10-25 16:11:50 +09:00