FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-22 09:22:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3f5fcf60e9
linux/arch/arm/mach-s5p64x0
History
Linus Torvalds 7abec10c62 Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 
* 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc: (79 commits)
  ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung
  ARM: SAMSUNG: Cleanup resources by using macro
  ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h
  ARM: S5P: To merge devs.c files to one devs.c
  ARM: S3C64XX: To merge devs.c files to one devs.c
  ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c
  ARM: S5P64X0: Add Power Management support
  ARM: S5P: Make the sleep code common for S5P series SoCs
  ARM: S5P: Make the common S5P PM code conditionally compile
  ARM: SAMSUNG: Move S5P header files to plat-samsung
  ARM: SAMSUNG: Move S3C24XX header files to plat-samsung
  ARM: SAMSUNG: Moving each SoC support header files
  ARM: SAMSUNG: Consolidate plat/pll.h
  ARM: SAMSUNG: Consolidate plat/pwm-clock.h
  ARM: SAMSUNG: Cleanup mach/clkdev.h
  ARM: SAMSUNG: remove sdhci default configuration setup platform helper
  ARM: EXYNOS4: Add FIMC device on SMDKV310 board
  ARM: EXYNOS4: Add header file protection macros
  ARM: EXYNOS4: Add usb ehci device to the SMDKV310
  ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
  ...

Fix up conflicts in
 - arch/arm/mach-exynos4/{Kconfig,clock.c}
	ARM_CPU_SUSPEND, various random device tables (gah!)
 - drivers/gpio/Makefile
	sa1100 gpio added, samsung gpio drivers merged
2011-11-05 18:18:05 -07:00
..
include/mach Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00
clock-s5p6440.c Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung 2011-09-19 10:30:49 +09:00
clock-s5p6450.c Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung 2011-09-19 10:30:49 +09:00
clock.c
cpu.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
dev-audio.c
dev-spi.c ARM: S5P64X0: Use soc_is_s5p64x0() to distinguish cpu at runtime 2011-08-22 07:14:08 +09:00
dma.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2011-11-04 18:02:25 -07:00
gpiolib.c gpio/s5p64x0: move gpio driver into drivers/gpio/ 2011-09-21 10:52:39 +09:00
init.c
irq-eint.c ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
irq-pm.c ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
Kconfig ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
mach-smdk6440.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smdk6450.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
Makefile ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
setup-fb-24bpp.c ARM: S5P64X0: Add GPIO setup for LCD 2011-10-04 19:00:53 +09:00
setup-i2c0.c
setup-i2c1.c