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: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed	2010-02-21 23:10:35 +00:00
entry-macro.S
gpio.h	ARM: gpio: make trivial GPIOLIB implementation the default	2011-08-12 08:54:19 +01:00
hardware.h
io.h	ARM: SAMSUNG: Move include/mach files out of plat-s3c	2010-02-24 01:52:12 +00:00
irqs.h	ARM: SAMSUNG: Remove uart irq handling from plaform code	2011-08-23 10:48:31 -07:00
map.h	ARM: S3C64XX: Add keypad device to the SMDK6410 board	2010-08-06 21:28:30 +09:00
pll.h	ARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-use	2010-05-10 11:44:37 +09:00
pm-core.h	ARM: SAMSUNG: Add support for pre-sleep/post-restore gpio control	2011-07-20 23:13:20 +09:00
pwm-clock.h
regs-clock.h	ARM: S3C64XX: Add support for Compact Flash driver on SMDK6410	2010-08-05 18:32:50 +09:00
regs-gpio-memport.h
regs-gpio.h
regs-irq.h
regs-modem.h
regs-srom.h
regs-sys.h
regs-syscon-power.h
s3c6400.h	ARM: S3C64XX: Combine the clock init code	2010-02-20 22:34:02 +00:00
s3c6410.h
spi-clocks.h
system.h
tick.h
timex.h	ARM: SAMSUNG: Move include/mach files out of plat-s3c	2010-02-24 01:52:12 +00:00
uncompress.h
vmalloc.h	ARM: S3C: Change VMALLOC_END to use more vmalloc()/ioremap() area	2010-10-25 16:11:44 +09:00