korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 16:54:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
909af768e8
linux/arch/arm/mach-s3c64xx
History
Mark Brown fa2c8f4017 Linux 3.3-rc4 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJPQDoTAAoJEHm+PkMAQRiGMpYH/ibfyIFBrKMD1v/s9oNvp8rS
 c7J7E7mHZOylCHrpIS3lX3ZbOfOe33Ln0Z59f1/TcV4CMMz0NrKYcTC8erj/H/DA
 8DRYegiczWKqiXRgktwaZXkJcwXYdOOL1WQYxuzzbZcwRrNBY2QpH7Zu8Bj+TPAy
 d4fvJHWdlh4sbWVdQmLRbp04UB9J/Z5/uWmSNvVQjLLdRlD+mEBbt7JjiNY6sUVC
 2sJoAs9F3UlHu7VaN+JIhMOGZ3GqOpHGBxN/aWxJ/7GsXdXuAfCrxoPxaAe4xzOa
 HndN5ZDyg02Vy5uDeUzj+HJPW3M8L4Q0nwxAYb3ZnQ5tbpu1Q2cHfIBealomWCQ=
 =R91X
 -----END PGP SIGNATURE-----

Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.

Linux 3.3-rc4

Conflicts:
	sound/soc/sh/fsi.c
2012-02-19 18:35:12 -08:00
..
include/mach ARM: S3C64XX: Fix the memory mapped GPIOs on Cragganmore 2012-01-12 02:18:32 +09:00
clock.c ARM: S3C6410: Use device names for both I2C clocks 2012-01-27 14:43:44 +09:00
common.c ARM: S3C64XX: Make s3c64xx_init_uarts() static 2012-01-27 14:41:20 +09:00
common.h Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
dev-audio.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
dev-uart.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
dma.c arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
irq-pm.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
Kconfig Board-level changes 2012-01-09 14:37:41 -08:00
mach-anw6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-crag6410-module.c ARM: S3C64XX: Use IN4 DC measurement mode on Tobermory 2012-01-27 11:23:31 +00:00
mach-crag6410.c Merge branch 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes 2012-01-16 22:46:19 -08:00
mach-hmt.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-mini6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-ncp.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-real6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq5.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq7.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq.c ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch] 2011-12-23 19:07:55 +00:00
mach-smartq.h ARM: S3C6410: Add basic support for SmartQ machines 2010-05-20 19:42:15 +09:00
mach-smdk6400.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
Makefile Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c ARM: S3C64XX: Remove unconditional power domain disables 2012-01-12 02:16:21 +09:00
s3c6400.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
s3c6410.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
setup-fb-24bpp.c ARM: S3C64XX: Remove extern from definition of framebuffer setup call 2011-12-02 14:17:36 +09:00
setup-i2c0.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-i2c1.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-ide.c ARM: S3C64XX: Ensure s3c64xx_ide_setup_gpio() is prototyped 2010-10-25 16:04:33 +09:00
setup-keypad.c ARM: S3C64XX: Fix keypad setup to configure correct number of rows 2011-03-04 15:46:26 +09:00
setup-sdhci-gpio.c ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:51:37 +09:00
setup-spi.c ARM: S3C64XX: Modified files for SPI consolidation work 2011-12-23 10:50:00 +09:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00