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
..
abort-ev4.S
abort-ev4t.S
abort-ev5t.S
abort-ev5tj.S
abort-ev6.S
abort-ev7.S
abort-lv4t.S
abort-macro.S	ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort	2011-09-10 23:39:56 +01:00
abort-nommu.S
alignment.c	ARM: allow building alignment.c without PROC_FS	2011-10-01 21:08:54 +02:00
cache-fa.S
cache-feroceon-l2.c
cache-l2x0.c	Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:17:32 +02:00
cache-tauros2.c
cache-v3.S
cache-v4.S
cache-v4wb.S
cache-v4wt.S
cache-v6.S
cache-v7.S	ARM: 7091/1: errata: D-cache line maintenance operation by MVA may not succeed	2011-09-17 12:47:17 +01:00
cache-xsc3l2.c
context.c	locking, ARM: Annotate low level hw locks as raw	2011-09-13 11:12:14 +02:00
copypage-fa.c
copypage-feroceon.c
copypage-v3.c
copypage-v4mc.c	locking, ARM: Annotate low level hw locks as raw	2011-09-13 11:12:14 +02:00
copypage-v4wb.c
copypage-v4wt.c
copypage-v6.c	locking, ARM: Annotate low level hw locks as raw	2011-09-13 11:12:14 +02:00
copypage-xsc3.c
copypage-xscale.c	locking, ARM: Annotate low level hw locks as raw	2011-09-13 11:12:14 +02:00
dma-mapping.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
extable.c
fault-armv.c
fault.c	ARM: 7115/4: move __exception and friends to asm/exception.h	2011-10-17 09:02:44 +01:00
fault.h
flush.c
highmem.c
idmap.c
init.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
iomap.c
ioremap.c	ARM: 7129/1: Add __arm_ioremap_exec for mapping external memory as MT_MEMORY	2011-10-22 22:24:48 +01:00
Kconfig	Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:41:04 -07:00
Makefile
mm.h	ARM: 7076/1: LPAE: Add (pte|pmd)val_t type definitions as u32	2011-10-06 15:40:05 +01:00
mmap.c
mmu.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
nommu.c
pabort-legacy.S
pabort-v6.S
pabort-v7.S
pgd.c
proc-arm6_7.S	Merge branch 'devel-stable' into for-next	2011-07-22 23:09:07 +01:00
proc-arm7tdmi.S
proc-arm9tdmi.S
proc-arm720.S
proc-arm740.S
proc-arm920.S	ARM: pm: only use preallocated page table during resume	2011-09-20 23:33:38 +01:00
proc-arm922.S
proc-arm925.S
proc-arm926.S	ARM: pm: only use preallocated page table during resume	2011-09-20 23:33:38 +01:00
proc-arm940.S
proc-arm946.S	ARM: 7005/1: freshen up mm/proc-arm946.S	2011-08-09 08:42:38 +01:00
proc-arm1020.S
proc-arm1020e.S
proc-arm1022.S
proc-arm1026.S
proc-fa526.S
proc-feroceon.S
proc-macros.S	ARM: Fix build errors caused by adding generic macros	2011-07-21 17:49:54 +01:00
proc-mohawk.S
proc-sa110.S
proc-sa1100.S	ARM: pm: only use preallocated page table during resume	2011-09-20 23:33:38 +01:00
proc-syms.c
proc-v6.S	ARM: pm: no need to save/restore context ID register	2011-09-20 23:33:40 +01:00
proc-v7.S	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
proc-xsc3.S	ARM: pm: only use preallocated page table during resume	2011-09-20 23:33:38 +01:00
proc-xscale.S	ARM: pm: only use preallocated page table during resume	2011-09-20 23:33:38 +01:00
tlb-fa.S	Merge branch 'devel-stable' into for-next	2011-07-22 23:09:07 +01:00
tlb-v3.S
tlb-v4.S
tlb-v4wb.S
tlb-v4wbi.S
tlb-v6.S	Merge branch 'devel-stable' into for-next	2011-07-22 23:09:07 +01:00
tlb-v7.S	Merge branch 'devel-stable' into for-next	2011-07-22 23:09:07 +01:00
vmregion.c
vmregion.h