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 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	13 years ago
Kconfig	ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen	15 years ago
Makefile	ARM: S3C2410: remove the now empty mach-s3c2410/irq.c	14 years ago
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	13 years ago
bast-ide.c	…
bast-irq.c	arm: Fold irq_set_chip/irq_set_handler	14 years ago
cpu-freq.c	…
dma.c	…
gpio.c	…
h1940-bluetooth.c	treewide: remove duplicate includes	14 years ago
mach-amlm5900.c	ARM: mach-s3c24*: convert boot_params to atag_offset	14 years ago
mach-bast.c	ARM: mach-s3c24*: convert boot_params to atag_offset	14 years ago
mach-h1940.c	ARM: mach-s3c24*: convert boot_params to atag_offset	14 years ago
mach-n30.c	ARM: mach-s3c24*: convert boot_params to atag_offset	14 years ago
mach-otom.c	ARM: mach-s3c24*: convert boot_params to atag_offset	14 years ago
mach-qt2410.c	ARM: mach-s3c24*: convert boot_params to atag_offset	14 years ago
mach-smdk2410.c	ARM: mach-s3c24*: convert boot_params to atag_offset	14 years ago
mach-tct_hammer.c	ARM: mach-s3c24*: convert boot_params to atag_offset	14 years ago
mach-vr1000.c	ARM: mach-s3c24*: convert boot_params to atag_offset	14 years ago
nor-simtec.c	ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info	14 years ago
nor-simtec.h	…
pll.c	…
pm-h1940.S	…
pm.c	ARM / Samsung: Use struct syscore_ops for "core" power management	14 years ago
s3c2410.c	ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM	13 years ago
sleep.S	…
usb-simtec.c	…
usb-simtec.h	…