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
..
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-17 09:13:40 +01:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-25 08:19:59 +01:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-09-26 10:11:25 -04:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-02-15 10:18:48 -08:00
2011-07-12 11:19:29 -05:00
2011-10-28 12:02:27 -07:00
2011-08-23 15:30:04 +01:00
2011-10-28 12:02:27 -07:00
2011-08-24 08:29:20 +01:00
2011-10-01 23:45:34 +01:00
2011-07-25 12:43:28 -07:00
2011-10-26 15:11:09 +02:00
2011-10-26 15:11:09 +02:00
2011-10-28 12:02:27 -07:00
2011-10-13 12:49:42 -04:00
2011-05-23 16:53:17 +01:00
2011-10-17 13:28:46 +01:00
2011-10-28 12:02:27 -07:00
2011-10-28 12:02:27 -07:00
2011-03-31 11:26:23 -03:00
2011-10-28 12:02:27 -07:00
2011-08-13 11:26:18 +01:00