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	Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-25 11:53:35 -07: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
clock-mx23.c	mx23: register clocks for mmc	2011-05-19 13:11:35 +02:00
clock-mx28.c	ARM: mxs/clock-mx28: fix up name##_set_rate	2011-04-12 09:48:02 +02:00
clock.c
devices-mx23.h
devices-mx28.h	ARM: mxs: fix naming of struct holding info for mxs-i2c devices	2011-05-19 13:11:23 +02:00
devices.c	gpio/mxs: Change gpio-mxs into an upstanding gpio driver	2011-06-06 10:01:19 -06:00
icoll.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
iomux.c
Kconfig	arm: mxs: add mmc-device for mach-tx28	2011-07-07 10:01:14 +02:00
mach-mx23evk.c	ARM: mxs/mach-mx2[38]evk: Set the initial value on gpio_request_one	2011-05-19 13:11:10 +02:00
mach-mx28evk.c	ARM: mxs/mx28evk: add leds-gpio device for heartbeat	2011-07-07 10:01:07 +02:00
mach-stmp378x_devb.c	ARM: mach-mxs: add stmp378x-devb	2011-05-02 19:08:54 +01:00
mach-tx28.c	arm: mxs: add mmc-device for mach-tx28	2011-07-07 10:01:14 +02:00
Makefile	gpio/mxs: Move Freescale mxs gpio driver to drivers/gpio	2011-06-06 09:37:58 -06:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mm-mx23.c	gpio/mxs: Change gpio-mxs into an upstanding gpio driver	2011-06-06 10:01:19 -06:00
mm-mx28.c	gpio/mxs: Change gpio-mxs into an upstanding gpio driver	2011-06-06 10:01:19 -06:00
module-tx28.c
module-tx28.h
ocotp.c	arm: mxs: include asm/processor.h for cpu_relax()	2011-06-06 09:50:04 +02:00
pm.c
regs-clkctrl-mx23.h
regs-clkctrl-mx28.h
system.c
timer.c	clocksource: convert MXS timrotv2 to 32-bit down counting clocksource	2011-05-23 18:04:52 +01:00