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
..
devices	dmaengine: imx-sdma: use platform_device_id to identify sdma version	2011-07-27 09:31:45 +08:00
include/mach	Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-28 12:02:27 -07:00
3ds_debugboard.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
audmux-v1.c	ARM: mxc: remove paragraphs with old address of the FSF	2010-06-30 09:00:28 +02:00
audmux-v2.c	ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC	2010-11-19 21:54:34 +01:00
avic.c	ARM i.MX avic: do not depend on MXC_INTERNAL_IRQS	2011-07-07 10:00:00 +02:00
clock.c	arm: mxc: utilise usecount field in clock operations	2010-07-26 14:17:57 +02:00
cpu.c	[ARM] MXC: add cpu_is_ macros	2009-03-13 10:34:26 +01:00
cpufreq.c	treewide: cleanup continuations and remove logging message whitespace	2011-04-26 10:24:37 +02:00
devices.c	ARM: mxc: convert device creation to use platform_device_register_full	2011-08-26 11:31:10 -07:00
epit.c	clocksource: convert ARM 32-bit down counting clocksources	2011-05-23 18:04:51 +01:00
iomux-v1.c	ARM: mxc: iomux-v1: Fix build warning	2011-07-07 09:07:33 +02:00
iomux-v3.c	MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2)	2010-12-15 12:42:49 +01:00
iram_alloc.c	ARM: imx: Add iram allocator functions	2010-10-19 18:44:57 +02:00
irq-common.c	ARM: mxc: convert tzic to use generic irq chip	2011-07-07 10:01:07 +02:00
irq-common.h	mx51: support FIQ on TZIC, revised	2010-12-14 09:54:37 +01:00
Kconfig	ARM: mxc: fix Kconfig typo 'i.MX51'	2011-10-13 10:26:47 +02:00
Makefile	gpio/mxc: Move Freescale MXC gpio driver to drivers/gpio	2011-06-06 10:01:19 -06:00
pwm.c	plat-mxc/pwm.c: use resource_size()	2011-07-07 10:00:01 +02:00
ssi-fiq-ksym.c	ASoC: Add a new imx-ssi sound driver	2010-01-17 11:09:46 +00:00
ssi-fiq.S	ARM: mxc: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL	2011-04-12 09:48:10 +02:00
system.c	ARM: remove support for mxc91231	2011-05-19 13:11:28 +02:00
time.c	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
tzic.c	ARM: mxc: convert tzic to use generic irq chip	2011-07-07 10:01:07 +02:00
ulpi.c	ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers	2011-03-07 19:29:41 +01:00