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
..
alpha	Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux	2011-10-25 15:42:01 +02:00
arm	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
avr32	All Arch: remove linkage for sys_nfsservctl system call	2011-08-26 15:09:58 -07:00
blackfin	Blackfin: irq: remove IRQF_DISABLED	2011-10-26 04:22:26 -04:00
cris	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2011-10-25 13:25:22 +02:00
frv	All Arch: remove linkage for sys_nfsservctl system call	2011-08-26 15:09:58 -07:00
h8300	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty	2011-10-26 15:11:09 +02:00
ia64	Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:11:53 +02:00
m32r	m32r: Allow use of atomic64	2011-10-17 23:29:43 -04:00
m68k	Merge branch 'for-linus' of git://github.com/gregungerer/m68knommu	2011-10-25 16:25:48 +02:00
microblaze	microblaze: add missing CONFIG_ prefixes	2011-10-13 10:39:24 +02:00
mips	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue	2011-10-28 10:49:34 -07:00
mn10300	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
openrisc	doc: fix broken references	2011-09-27 18:08:04 +02:00
parisc	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue	2011-10-28 10:49:34 -07:00
powerpc	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue	2011-10-28 10:49:34 -07:00
s390	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue	2011-10-28 10:49:34 -07:00
score	modules: make arch's use default loader hooks	2011-07-24 22:06:04 +09:30
sh	net: sh_eth: move the asm/sh_eth.h to include/linux/	2011-09-28 13:41:51 -04:00
sparc	compat: sync compat_stats with statfs.	2011-10-28 14:58:53 +02:00
tile	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
um	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
unicore32	doc: fix broken references	2011-09-27 18:08:04 +02:00
x86	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue	2011-10-28 10:49:34 -07:00
xtensa	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
.gitignore	…
Kconfig	Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG	2011-08-03 11:12:37 -04:00