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	ARM: mach-mv78xx0: remove mach/memory.h	2011-10-13 12:49:29 -04:00
Kconfig	[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)	2010-02-23 17:10:08 -05:00
Makefile	[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)	2010-02-23 17:10:08 -05:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
addr-map.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
buffalo-wxl-setup.c	ARM: mach-mv78xx0: convert boot_params to atag_offset	2011-08-21 17:15:00 -04:00
common.c	ARM: orion: Consolidate SATA platform setup.	2011-05-16 15:13:19 -04:00
common.h	ARM: Remove dependency of plat-orion time code on mach directory includes.	2011-03-03 16:27:01 -05:00
db78x00-bp-setup.c	ARM: mach-mv78xx0: convert boot_params to atag_offset	2011-08-21 17:15:00 -04:00
irq.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
mpp.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
mpp.h	ARM: orion: Refactor the MPP code common in the orion platform	2011-05-16 15:25:54 -04:00
pcie.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-07-29 23:35:05 -07:00
rd78x00-masa-setup.c	ARM: mach-mv78xx0: convert boot_params to atag_offset	2011-08-21 17:15:00 -04:00