OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/arm/mach-prima2
History
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: mach-prima2: remove mach/memory.h 2011-10-13 12:49:50 -04:00
Makefile ARM: CSR: initializing L2 cache 2011-07-09 07:21:53 +08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
clock.c ARM: CSR: add missing sentinels to of_device_id tables 2011-09-11 09:11:26 +08:00
common.h ARM: CSR: mapping early DEBUG_LL uart 2011-07-09 07:20:51 +08:00
irq.c ARM: CSR: add missing sentinels to of_device_id tables 2011-09-11 09:11:26 +08:00
l2x0.c ARM: mach-prima2: remove mach/memory.h 2011-10-13 12:49:50 -04:00
lluart.c ARM: CSR: mapping early DEBUG_LL uart 2011-07-09 07:20:51 +08:00
prima2.c ARM: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-09-06 17:25:54 -04:00
rstc.c ARM: CSR: add missing sentinels to of_device_id tables 2011-09-11 09:11:26 +08:00
timer.c ARM: CSR: add missing sentinels to of_device_id tables 2011-09-11 09:11:26 +08:00