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: 7078/1: Footbridge: Sort KConfig Options alphabetically	13 years ago
Makefile	…
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	13 years ago
cats-hw.c	Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	13 years ago
cats-pci.c	PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.	14 years ago
common.c	arm: Fold irq_set_chip/irq_set_handler	14 years ago
common.h	…
dc21285-timer.c	ARM: footbridge: fix clock event support	14 years ago
dc21285.c	ARM: mach-footbridge: add missing header file <video/vga.h>	14 years ago
dma.c	…
ebsa285-leds.c	…
ebsa285-pci.c	PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.	14 years ago
ebsa285.c	ARM: mach-footbridge: convert boot_params to atag_offset	14 years ago
isa-irq.c	arm: Fold irq_set_chip/irq_set_handler	14 years ago
isa-rtc.c	…
isa-timer.c	arm: Footbridge: Use common i8253 clockevent	14 years ago
isa.c	…
netwinder-hw.c	Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	13 years ago
netwinder-leds.c	locking, ARM: Annotate low level hw locks as raw	14 years ago
netwinder-pci.c	PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.	14 years ago
personal-pci.c	PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.	14 years ago
personal.c	ARM: mach-footbridge: convert boot_params to atag_offset	14 years ago