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	ARM: mach-kirkwood: remove mach/memory.h	14 years ago
Kconfig	Kirkwood: Add support for 6282 based QNAP devices	14 years ago
Makefile	[ARM] Kirkwood: remove duplicated code in LaCie setup files	15 years ago
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	13 years ago
addr-map.c	…
common.c	ARM: orion: Consolidate setup of the crypto engine.	14 years ago
common.h	ARM: Remove dependency of plat-orion time code on mach directory includes.	14 years ago
cpuidle.c	…
d2net_v2-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
db88f6281-bp-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
dockstar-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
guruplug-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
irq.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	14 years ago
lacie_v2-common.c	[ARM] Kirkwood: fix timer initialization for LaCie boards	14 years ago
lacie_v2-common.h	[ARM] Kirkwood: fix timer initialization for LaCie boards	14 years ago
mpp.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	14 years ago
mpp.h	ARM: orion: Refactor the MPP code common in the orion platform	14 years ago
mv88f6281gtw_ge-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
netspace_v2-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
netxbig_v2-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
openrd-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
pcie.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	14 years ago
rd88f6192-nas-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
rd88f6281-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
sheevaplug-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
t5325-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
ts41x-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
ts219-setup.c	ARM: mach-kirkwood: convert boot_params to atag_offset	14 years ago
tsx1x-common.c	Fix common misspellings	14 years ago
tsx1x-common.h	…