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
..
Makefile	ARM: vfp: use -mfloat-abi=soft to build vfp	2011-10-01 21:08:55 +02:00
entry.S	Thumb-2: Add some .align statements to the .S files	2009-07-24 12:32:52 +01:00
vfp.h	[ARM] 5387/1: Add ptrace VFP support on ARM	2009-02-12 10:59:43 +00:00
vfpdouble.c	[ARM] vfp: fix fuitod/fsitod instructions	2008-01-10 17:07:08 +00:00
vfphw.S	ARM: vfp: fix a hole in VFP thread migration	2011-07-09 17:22:12 +01:00
vfpinstr.h	[ARM] 4583/1: ARMv7: Add VFPv3 support	2008-01-26 14:41:28 +00:00
vfpmodule.c	ARM: vfp: Fix the comment to make it consistent with the code.	2011-09-23 12:05:30 +05:30
vfpsingle.c	[ARM] Remove unnecessary asm/ptrace.h from VFP support code	2007-04-22 10:56:40 +01:00