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