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
dev-uart.c
dma.c	arm: convert sysdev_class to a regular subsystem	2011-12-21 16:01:38 -08:00
irq-pm.c
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-smartq.c	ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]	2011-12-23 19:07:55 +00:00
mach-smartq.h
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-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
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
setup-i2c0.c
setup-i2c1.c
setup-ide.c
setup-keypad.c
setup-sdhci-gpio.c
setup-spi.c	ARM: S3C64XX: Modified files for SPI consolidation work	2011-12-23 10:50:00 +09:00
sleep.S