p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/arch/arm/mach-bcmring
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
..
csp Fix common misspellings 2011-03-31 11:26:23 -03:00
include ARM: mach-bcmring: remove mach/memory.h 2011-10-13 12:49:48 -04:00
Kconfig bcmring: drop commented out line in Kconfig 2011-10-06 17:50:47 +02:00
Makefile ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring 2009-08-15 16:01:50 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
arch.c ARM: platform fixups: remove mdesc argument to fixup function 2011-10-17 09:13:41 +01:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.h ARM: 5644/1: add bcmring core.c, clock.c, clock.h 2009-08-15 16:01:38 +01:00
core.c ARM: bcmring: convert to use sp804 clockevents 2011-05-23 18:04:54 +01:00
core.h ARM: 6912/1: bcmring: Add clkdev table in init_early 2011-05-23 18:04:54 +01:00
dma.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
dma_device.c ARM: 5647/1: bcmring: add bcmring dma.h and dma_device.c 2009-08-15 16:01:40 +01:00
irq.c Remove unneeded version.h includes from arch/arm/ 2011-09-15 14:57:06 +02:00
mm.c ARM: mach-bcmring: Setup consistent dma size at boot time 2011-08-22 12:00:12 +00:00
timer.c Remove unneeded version.h includes from arch/arm/ 2011-09-15 14:57:06 +02:00