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-26 17:08:43 +02:00
2011-10-27 08:39:10 +02:00
2011-10-25 13:25:22 +02:00
2011-10-25 15:18:39 +02:00
2011-10-25 12:11:02 +02:00
2011-10-25 15:18:39 +02:00
2011-10-28 05:54:23 -07:00
2011-10-26 17:15:03 +02:00
2011-10-26 17:15:03 +02:00
2011-10-27 08:39:10 +02:00
2011-10-28 05:54:23 -07:00
2011-10-26 21:46:20 -07:00
2011-10-11 09:51:22 -06:00
2011-10-28 05:14:48 -07:00
2011-10-27 08:39:10 +02:00
2011-10-27 08:39:10 +02:00
2011-10-19 03:10:46 -04:00
2011-10-27 08:44:20 +02:00
2011-10-26 16:17:32 +02:00
2011-10-26 15:11:09 +02:00
2011-10-28 05:04:26 -07:00
2011-10-26 21:39:42 +02:00
2011-10-25 15:18:39 +02:00
2011-10-27 08:39:10 +02:00
2011-10-25 12:13:59 +02:00
2011-10-27 08:41:50 +02:00
2011-10-27 08:39:10 +02:00
2011-10-27 08:39:10 +02:00
2011-10-25 06:55:52 +02:00
2011-10-18 14:17:40 -07:00
2011-10-26 16:11:53 +02:00
2011-10-27 08:39:10 +02:00
2011-10-25 10:43:57 +02:00
2011-10-07 09:39:51 +02:00
2011-10-25 13:25:22 +02:00
2011-10-26 21:33:50 +02:00
2011-10-27 08:41:50 +02:00
2011-10-28 05:54:23 -07:00
2011-10-25 12:11:02 +02:00
2011-10-27 08:41:50 +02:00
2011-10-18 11:18:57 -07:00
2011-10-28 12:02:27 -07:00
2011-10-27 08:41:50 +02:00
2011-10-24 02:07:21 -04:00
2011-10-26 17:03:38 +02:00
2011-10-26 16:44:09 +02:00
2011-10-24 21:00:34 +02:00
2011-10-26 15:39:02 +02:00
2011-10-26 15:39:02 +02:00