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

clksel.c

ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform

2009-09-02 11:22:23 +01:00

clock.c

ARM: Consolidate clks_register() and similar

2010-02-12 17:32:36 +00:00

clock.h

ARM: 6483/1: arm & sh: factorised duplicated clkdev.c

2010-11-26 10:51:04 +00:00

cpu.c

treewide: remove extra semicolons from various parts of the kernel

2011-09-15 14:50:49 +02:00

cpu.h

NUC900 LCD Controller Driver

2010-03-12 15:52:34 -08:00

dev.c

ARM: 6250/1: patch for modifying spi flash configuration

2010-07-22 09:20:18 +01:00

gpio.c

ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform

2009-09-02 11:22:23 +01:00

irq.c

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

Kconfig

ARM: 5684/1: Add nuc960 platform to w90x900

2009-09-02 11:22:24 +01:00

mach-nuc910evb.c

ARM: mach-w90x900: remove useless boot_params entries

2011-08-21 17:15:22 -04:00

mach-nuc950evb.c

ARM: mach-w90x900: remove useless boot_params entries

2011-08-21 17:15:22 -04:00

mach-nuc960evb.c

ARM: mach-w90x900: remove useless boot_params entries

2011-08-21 17:15:22 -04:00

Makefile

ARM: 5684/1: Add nuc960 platform to w90x900

2009-09-02 11:22:24 +01:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +01:00

mfp.c

ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900

2010-05-24 22:25:34 +01:00

nuc910.c

ARM: 6249/1: add nuc900 kpi platform_device structure to nuc910_dev

2010-07-22 09:20:17 +01:00

nuc910.h

ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform

2009-09-02 11:22:23 +01:00

nuc950.c

ARM: 6231/1: re-organize the nuc900 lcd arch platform data setting

2010-07-22 09:20:16 +01:00

nuc950.h

ARM: 5683/1: Add nuc950 platform to w90x900

2009-09-02 11:22:24 +01:00

nuc960.c

ARM: 5684/1: Add nuc960 platform to w90x900

2009-09-02 11:22:24 +01:00

nuc960.h

ARM: 5684/1: Add nuc960 platform to w90x900

2009-09-02 11:22:24 +01:00

time.c

clocksource: convert W90x900 24-bit down counting clocksource

2011-05-23 18:04:52 +01:00