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

ARM: OMAP: move OMAP1 memory config from plat/memory.h to its mach/memory.h

2011-09-26 10:12:02 -04:00

ams-delta-fiq-handler.S

Fix common misspellings

2011-03-31 11:26:23 -03:00

ams-delta-fiq.c

ARM: omap1: irq_data conversion.

2011-01-13 17:18:51 +01:00

board-ams-delta.c

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

board-fsample.c

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

board-generic.c

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

board-h2-mmc.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

board-h2.c

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

board-h2.h

ARM: OMAP: No need to include board-h2.h from hardware.h

2009-03-23 18:07:33 -07:00

board-h3-mmc.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

board-h3.c

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

board-h3.h

ARM: OMAP: No need to include board-h3.h from hardware.h

2009-03-23 18:07:33 -07:00

board-htcherald.c

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

board-innovator.c

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

board-nokia770.c

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

board-osk.c

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

board-palmte.c

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

board-palmtt.c

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

board-palmz71.c

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

board-perseus2.c

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

board-sx1-mmc.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

board-sx1.c

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

board-voiceblue.c

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

clock_data.c

OMAP1: clock_data: use runtime cpu / machine checks

2010-12-21 21:08:15 -07:00

clock.c

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

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

clock.h

OMAP1: clock: some cleanup

2010-07-26 16:34:28 -06:00

devices.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

dma.c

arch/arm/mach-omap1/dma.c: Invert calls to platform_device_put and platform_device_del

2011-06-01 02:25:04 -07:00

flash.c

ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info

2011-05-20 22:27:34 +01:00

fpga.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

gpio7xx.c

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

2011-07-22 14:50:57 -07:00

gpio15xx.c

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

2011-07-22 14:50:57 -07:00

gpio16xx.c

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

2011-07-22 14:50:57 -07:00

i2c.c

omap: i2c: Fix muxing for command line enabled bus

2010-02-25 14:45:08 -08:00

id.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

io.c

ARM: omap: Setup consistent dma size at boot time

2011-08-22 12:00:10 +00:00

irq.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

Kconfig

omap1: Fix booting for 15xx and 730 with omap1_defconfig

2011-01-19 10:38:43 -08:00

lcd_dma.c

OMAP1: Fix non-working LCD on OMAP310

2011-02-02 12:13:50 -08:00

leds-h2p2-debug.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

leds-innovator.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

leds-osk.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

leds.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

leds.h

[PATCH] ARM: 2799/1: OMAP update 4/11: Move OMAP1 LED code into mach-omap1 directory

2005-07-10 19:58:10 +01:00

mailbox.c

arm: omap1: mbox: delete unused variable

2010-11-24 16:48:47 -08:00

Makefile

OMAP1: PM: register notifiers with generic clock ops even when !PM_RUNTIME

2011-06-14 05:53:18 -07:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

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

mcbsp.c

omap: mcbsp: Remove port number enums

2011-07-07 12:06:34 -07:00

mux.c

arm: omap1: make some functions static

2010-11-24 16:48:25 -08:00

opp_data.c

OMAP1 clock: convert mach-omap1/clock.h to mach-omap1/clock_data.c

2009-12-11 17:00:40 -07:00

opp.h

OMAP1 clock: convert mach-omap1/clock.h to mach-omap1/clock_data.c

2009-12-11 17:00:40 -07:00

pm_bus.c

PM: Move clock-related definitions and headers to separate file

2011-08-25 15:34:19 +02:00

pm.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

pm.h

ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM

2011-02-04 14:26:08 +00:00

reset.c

ARM: OMAP: Allow platforms to hook reset cleanly

2011-01-27 16:39:48 -08:00

serial.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

sleep.S

ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM

2011-02-04 14:26:08 +00:00

sram.S

ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM

2011-02-04 14:26:08 +00:00

time.c

omap: Set separate timer init functions to avoid cpu_is_omap tests

2011-06-20 01:25:39 -07:00

timer32k.c

omap2+: Reserve clocksource and timesource and initialize dmtimer later

2011-06-27 12:14:01 -07:00

usb.c

omap: Move omap1 USB platform init code into mach-omap1/usb.c

2010-07-05 16:31:30 +03:00