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
..
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
assabet.c	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
badge4.c	ARM: mach-sa1100: convert boot_params to atag_offset	2011-08-21 17:15:13 -04:00
cerf.c
clock.c
collie.c
cpu-sa1100.c
cpu-sa1110.c
dma.c
generic.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
generic.h
h3xxx.c
h3100.c	ARM: mach-sa1100: convert boot_params to atag_offset	2011-08-21 17:15:13 -04:00
h3600.c	ARM: mach-sa1100: convert boot_params to atag_offset	2011-08-21 17:15:13 -04:00
hackkit.c	ARM: mach-sa1100: convert boot_params to atag_offset	2011-08-21 17:15:13 -04:00
irq.c
jornada720_ssp.c
jornada720.c	ARM: mach-sa1100: convert boot_params to atag_offset	2011-08-21 17:15:13 -04:00
Kconfig
lart.c	ARM: mach-sa1100: convert boot_params to atag_offset	2011-08-21 17:15:13 -04:00
leds-assabet.c
leds-badge4.c
leds-cerf.c
leds-hackkit.c
leds-lart.c
leds.c	ARM: 7026/1: simpad: replace ARM specific LED code	2011-10-17 09:12:42 +01:00
leds.h	ARM: 7026/1: simpad: replace ARM specific LED code	2011-10-17 09:12:42 +01:00
Makefile	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
nanoengine.c	ARM: mach-sa1100: convert boot_params to atag_offset	2011-08-21 17:15:13 -04:00
neponset.c
pci-nanoengine.c	mach-sa1100: fix PCI build problem	2011-08-10 16:00:48 +00:00
pleb.c
pm.c
shannon.c	ARM: mach-sa1100: convert boot_params to atag_offset	2011-08-21 17:15:13 -04:00
simpad.c	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
sleep.S
ssp.c
time.c