hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux-sg2042/arch/arm/mach-s3c64xx
History
Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
 		2010-08-16 18:42:58 +01:00
..
include/mach Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux 2010-08-14 11:59:44 -07:00
Kconfig Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux 2010-08-14 11:59:44 -07:00
Makefile Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux 2010-08-14 11:59:44 -07:00
Makefile.boot
…
clock.c ARM: S3C64XX: Add keypad device to the SMDK6410 board 2010-08-06 21:28:30 +09:00
cpu.c ARM: S3C64XX: Merge s3c6400-init.c into cpu.c 2010-02-20 22:34:01 +00:00
cpufreq.c ARM: S3C64XX: Move core support to mach-s3c64xx 2010-02-20 22:33:54 +00:00
dev-audio.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
dev-onenand1.c ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
dev-spi.c ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs 2010-08-06 21:28:44 +09:00
dev-uart.c ARM: S3C64XX: Move device and device setup into mach-s3c64xx 2010-02-20 22:32:01 +00:00
dma.c DMAENGINE: correct PL080 register header file 2010-08-14 16:29:55 +01:00
gpiolib.c ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs 2010-08-06 21:28:44 +09:00
irq-eint.c ARM: S3C64XX: Move IRQ support into mach-s3c64xx 2010-02-20 22:32:00 +00:00
irq-pm.c ARM: S3C64XX: Move IRQ support into mach-s3c64xx 2010-02-20 22:32:00 +00:00
irq.c ARM: S3C64XX: Move IRQ support into mach-s3c64xx 2010-02-20 22:32:00 +00:00
mach-anw6410.c arm: samsung: remove pixclock from several boards 2010-08-11 08:59:12 -07:00
mach-hmt.c arm: samsung: remove pixclock from several boards 2010-08-11 08:59:12 -07:00
mach-ncp.c ARM: S3C64XX: Move core support to mach-s3c64xx 2010-02-20 22:33:54 +00:00
mach-real6410.c ARM: mach-real6410: add sdhc device support 2010-08-14 16:10:23 +01:00
mach-smartq.c ARM: S3C64XX: Add audio support to SmartQ 2010-08-14 16:16:28 +01:00
mach-smartq.h ARM: S3C6410: Add basic support for SmartQ machines 2010-05-20 19:42:15 +09:00
mach-smartq5.c Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux 2010-08-14 11:59:44 -07:00
mach-smartq7.c Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux 2010-08-14 11:59:44 -07:00
mach-smdk6400.c ARM: SAMSUNG: Remove old email address for ben-linux@fluff.org 2010-05-12 10:06:28 +09:00
mach-smdk6410.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
pm.c ARM: S3C64XX: PM: Synchronise wakeup mask on suspend 2010-05-20 21:07:08 +09:00
s3c6400.c ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
s3c6410.c ARM: SAMSUNG: Implement set_name function for ADC devices 2010-08-05 18:32:50 +09:00
setup-fb-24bpp.c ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs 2010-08-06 21:28:44 +09:00
setup-i2c0.c ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs 2010-08-06 21:28:44 +09:00
setup-i2c1.c ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs 2010-08-06 21:28:44 +09:00
setup-ide.c ARM: S3C64XX: Add support for Compact Flash driver on SMDK6410 2010-08-05 18:32:50 +09:00
setup-keypad.c ARM: S3C64XX: Add keypad device to the SMDK6410 board 2010-08-06 21:28:30 +09:00
setup-sdhci-gpio.c ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs 2010-08-06 21:28:44 +09:00
setup-sdhci.c ARM: S3C64XX: Squash SDHCI setup into one file 2010-01-26 10:38:52 +09:00
sleep.S ARM: S3C64XX: Move core support to mach-s3c64xx 2010-02-20 22:33:54 +00:00