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
..
3ds_debugboard.h
audmux.h
board-mx31ads.h
board-mx31lilly.h
board-mx31lite.h
board-mx31moboard.h
board-pcm038.h
clock.h
common.h	gpio/mxc: get rid of the uses of cpu_is_mx()	2011-07-08 12:38:12 -06: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	ARM: mxc: convert device creation to use platform_device_register_full	2011-08-26 11:31:10 -07:00
dma.h	dmaengine: imx-sdma: use platform_device_id to identify sdma version	2011-07-27 09:31:45 +08:00
entry-macro.S	ARM: entry: remove unused irq_prio_table macro	2011-06-28 10:34:58 +01:00
esdhc.h	mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5	2011-07-27 09:31:14 +08:00
eukrea-baseboards.h
gpio.h	ARM: gpio: make trivial GPIOLIB implementation the default	2011-08-12 08:54:19 +01:00
hardware.h	ARM i.MX: remove SoC defines around header includes	2011-07-07 09:59:58 +02:00
i2c.h
iim.h
imx-uart.h
imxfb.h
io.h
iomux-mx1.h
iomux-mx2x.h
iomux-mx3.h
iomux-mx21.h
iomux-mx25.h	ARM: mx25: Fix typo on CAN1_RX pad setting	2011-07-15 10:11:28 +02:00
iomux-mx27.h
iomux-mx35.h
iomux-mx50.h
iomux-mx51.h
iomux-mx53.h	Merge commit 'v3.1-rc1' into imx-fixes	2011-08-08 08:22:41 +02:00
iomux-v1.h	ARM i.MX: get rid of wrong MXC_INTERNAL_IRQ usage	2011-07-07 10:00:00 +02:00
iomux-v3.h	MXC: iomux-v3: correct NO_PAD_CTRL definition	2011-07-07 09:07:41 +02:00
ipu.h
iram.h
irqs.h	ARM: mxc: use ARCH_NR_GPIOS to define gpio number	2011-07-08 12:38:18 -06:00
mmc.h
mx1_camera.h
mx1.h
mx2_cam.h
mx2x.h
mx3_camera.h
mx3fb.h
mx3x.h
mx21-usbhost.h
mx21.h
mx25.h
mx27.h
mx31.h
mx35.h
mx50.h
mx51.h
mx53.h	ARM: mx53: Add SSI suport	2011-07-07 10:01:13 +02:00
mxc_ehci.h
mxc_nand.h
mxc.h	ARM i.MX mxc.h: use CONFIG_SOC_* instead of CONFIG_ARCH_*	2011-07-07 09:59:59 +02:00
sdma.h	dmaengine: imx-sdma: use platform_device_id to identify sdma version	2011-07-27 09:31:45 +08:00
spi.h
ssi.h
system.h
timex.h	ARM i.MX: define CLOCK_TICK_RATE to bogus value	2011-07-07 09:59:58 +02:00
ulpi.h
uncompress.h	ARM: mach-mx5/mx53_ard: Add support for i.MX53 ARD board	2011-07-07 10:01:07 +02:00
usb.h
vmalloc.h