You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		13 years ago
..
include/mach	Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable	14 years ago
Kconfig	ARM: 6520/1: Kconfig: add new symbol MIGHT_HAVE_PCI	14 years ago
Makefile	ARM: cns3xxx: Add support for SDHCI controllers	15 years ago
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	14 years ago
cns3420vb.c	ARM: mach-cns3xxx: convert boot_params to atag_offset	14 years ago
core.c	ARM: cns3xxx: Add support for L2 Cache Controller	14 years ago
core.h	ARM: cns3xxx: Add support for L2 Cache Controller	14 years ago
devices.c	ARM: cns3xxx: Add new and export the old power management functions	14 years ago
devices.h	ARM: cns3xxx: Add support for AHCI controllers	15 years ago
pcie.c	ARM: cns3xxx: Fix newly introduced warnings in the PCIe code	14 years ago
pm.c	atomic: use <linux/atomic.h>	14 years ago