OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/arm/mach-davinci
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 Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
Kconfig ARM: Davinci: Fix I2C build errors 2011-04-25 14:19:32 +05:30
Makefile ARM: 7039/1: mach-davinci: move DaVinci TNET GPIO driver to GPIO subsystem 2011-08-22 09:12:55 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
aemif.c
…
board-da830-evm.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-da850-evm.c Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable 2011-09-21 08:48:33 +01:00
board-dm355-evm.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-dm355-leopard.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-dm365-evm.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-dm644x-evm.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-dm646x-evm.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-mityomapl138.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-neuros-osd2.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-omapl138-hawk.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-sffsdr.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
board-tnetv107x-evm.c ARM: mach-davinci: convert boot_params to atag_offset 2011-08-21 17:14:43 -04:00
cdce949.c
…
clock.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
clock.h Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
common.c ARM: mach-davinci: Setup consistent dma size at boot time 2011-08-22 12:00:11 +00:00
cp_intc.c
…
cpufreq.c [CPUFREQ] use dynamic debug instead of custom infrastructure 2011-05-04 11:50:57 -04:00
cpuidle.c ARM: mach-davinci: remove mach/memory.h 2011-10-13 12:49:47 -04:00
da830.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
da850.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
devices-da8xx.c davinci: da850: add support for SATA interface 2011-07-08 11:13:08 +05:30
devices-tnetv107x.c
…
devices.c davinci: make PCM platform devices static 2011-06-08 14:41:37 +05:30
dm355.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
dm365.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
dm644x.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
dm646x.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
dma.c
…
io.c
…
irq.c Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-19 22:10:05 -07:00
mux.c
…
mux.h
…
pm.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
psc.c davinci: enable forced transitions on PSC 2011-07-08 11:10:09 +05:30
serial.c
…
sleep.S Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable 2011-10-18 13:40:54 +01:00
sram.c
…
time.c
…
tnetv107x.c ARM: 7040/1: mach-davinci: break out GPIO driver specifics 2011-08-22 09:12:56 +01:00
usb.c
…