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
..
include/mach	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
Kconfig	Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:41:04 -07:00
Makefile	[CPUFREQ] Move ARM Samsung cpufreq drivers to drivers/cpufreq/	2011-07-13 18:29:51 -04:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
clock.c	ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver	2011-09-27 07:00:53 +09:00
cpu.c	ARM: mach-s5pv210: Setup consistent dma size at boot time	2011-08-22 12:00:11 +00:00
dev-audio.c	ARM: SAMSUNG: Add IRQ_I2S0 definition	2011-07-21 17:27:28 +09:00
dev-spi.c	ARM: SAMSUNG: Add tx_st_done variable	2011-07-06 15:03:08 +09:00
dma.c	ARM: S5P: Reorder DMA platform device id	2010-10-25 16:10:47 +09:00
init.c	ARM: S5PV210: Add Samsung S5PV210 CPU support	2010-02-24 22:47:21 +00:00
mach-aquila.c	ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset	2011-08-21 17:15:12 -04:00
mach-goni.c	ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset	2011-08-21 17:15:12 -04:00
mach-smdkc110.c	ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset	2011-08-21 17:15:12 -04:00
mach-smdkv210.c	ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset	2011-08-21 17:15:12 -04:00
mach-torbreck.c	ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset	2011-08-21 17:15:12 -04:00
pm.c	ARM: S5PV210: Fix build warning	2011-08-19 20:57:35 +09:00
setup-fb-24bpp.c	ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210	2011-07-21 02:11:34 +09:00
setup-fimc.c	ARM: S5P: Add platform helpers for camera GPIO configuration	2011-03-11 15:49:00 +09:00
setup-i2c0.c	ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range()	2010-10-23 11:51:09 +09:00
setup-i2c1.c	ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range()	2010-10-23 11:51:09 +09:00
setup-i2c2.c	ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range()	2010-10-23 11:51:09 +09:00
setup-ide.c	ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull()	2010-10-23 11:52:26 +09:00
setup-keypad.c	ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull()	2010-10-23 11:52:26 +09:00
setup-sdhci-gpio.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
setup-sdhci.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sleep.S	ARM: pm: samsung: move cpu_suspend into C code	2011-06-24 08:48:44 +01:00