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
..
clock.h	ARM i.MX23/28: remove secondary field from struct clk. It's unused	2011-01-24 09:01:48 +01:00
common.h	ARM: mxs: add ocotp read function	2011-01-21 11:36:49 +01: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-common.h	gpio/mxs: Change gpio-mxs into an upstanding gpio driver	2011-06-06 10:01:19 -06:00
dma.h	ARM: mxs-dma: include <linux/dmaengine.h>	2011-07-15 10:45:28 +02:00
entry-macro.S	ARM: mxs: Add interrupt support	2010-12-20 10:37:56 +01:00
gpio.h	ARM: gpio: make trivial GPIOLIB implementation the default	2011-08-12 08:54:19 +01:00
hardware.h
io.h
iomux-mx23.h	ARM: mxs: fix typo "GPO" in iomux-mx23.h	2011-03-07 19:29:47 +01:00
iomux-mx28.h	ARM: mxs: Add iomux support	2010-12-20 17:29:58 +01:00
iomux.h	ARM: mxs: add helper macro for pad control	2011-03-07 19:29:45 +01:00
irqs.h
mmc.h	mmc: mxs-mmc: add mmc host driver for i.MX23/28	2011-03-15 13:49:37 -04:00
mx23.h	ARM: mxs/i.MX23: make i2c defines consistent and match the reference manual	2011-05-19 13:11:21 +02:00
mx28.h	ARM: mxs: make ssp error irq definition consistent	2011-03-07 19:29:54 +01:00
mxs.h	ARM: mxs: Initial support for Ka-Ro TX28	2011-03-07 19:29:07 +01:00
mxsfb.h	video: Add i.MX23/28 framebuffer driver	2011-03-07 19:29:30 +01:00
system.h	ARM: mxs: Add reset routines	2010-12-20 10:37:52 +01: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