OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/arm/mach-exynos4
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: pm: let platforms select cpu_suspend support 2011-10-01 21:09:39 +02:00
Makefile 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
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
clock.c ARM: EXYNOS4: Rename sclk_cam clocks for FIMC driver 2011-09-27 07:00:59 +09:00
cpu.c ARM: EXYNOS4: Add restart hook for proper reboot 2011-08-19 21:21:08 +09:00
cpuidle.c
…
dev-ahci.c
…
dev-audio.c ARM: SAMSUNG: Add platform device for idma 2011-07-21 14:12:19 +09:00
dev-dwmci.c ARM: EXYNOS4: Add platform device for dwmci driver 2011-07-21 01:46:43 +09:00
dev-pd.c
…
dev-sysmmu.c
…
dma.c
…
headsmp.S ARM: EXYNOS4: Address a section mismatch w/ suspend issue. 2011-07-06 08:43:03 +09:00
hotplug.c ARM: EXYNOS4: Add support Core1 Power On/Off with hotplug in/out 2011-07-20 23:36:19 +09:00
init.c ARM: SAMSUNG: serial: Fix on handling of one clock source for UART 2011-06-07 09:25:34 -07:00
irq-combiner.c
…
irq-eint.c ARM: EXYNOS4: add required chained_irq_enter/exit to eint code 2011-08-19 20:57:37 +09:00
mach-armlex4210.c ARM: mach-exynos4: convert boot_params to atag_offset 2011-08-21 17:14:47 -04:00
mach-nuri.c ARM: mach-exynos4: convert boot_params to atag_offset 2011-08-21 17:14:47 -04:00
mach-smdkc210.c ARM: mach-exynos4: convert boot_params to atag_offset 2011-08-21 17:14:47 -04:00
mach-smdkv310.c ARM: mach-exynos4: convert boot_params to atag_offset 2011-08-21 17:14:47 -04:00
mach-universal_c210.c Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable 2011-09-16 21:45:16 +01:00
mct.c 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
platsmp.c Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus 2011-10-25 08:19:29 +01:00
pm.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
pmu.c ARM: EXYNOS4: Support system level power down configuration 2011-07-20 23:38:07 +09:00
setup-fimc.c
…
setup-fimd0.c ARM: EXYNOS4: Add platform device and helper functions for FIMD 2011-07-21 17:28:51 +09:00
setup-i2c0.c
…
setup-i2c1.c
…
setup-i2c2.c
…
setup-i2c3.c
…
setup-i2c4.c
…
setup-i2c5.c
…
setup-i2c6.c
…
setup-i2c7.c
…
setup-keypad.c ARM: EXYNOS4: fix incorrect pad configuration for keypad row lines 2011-09-15 15:54:20 +09:00
setup-sdhci-gpio.c
…
setup-sdhci.c
…
setup-usb-phy.c ARM: EXYNOS4: Increase reset delay for USB HOST PHY 2011-08-19 20:57:39 +09:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00