fa2c8f4017
-----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 |
||
---|---|---|
.. | ||
include/mach | ||
clock.c | ||
common.c | ||
common.h | ||
dev-audio.c | ||
dev-uart.c | ||
dma.c | ||
irq-pm.c | ||
Kconfig | ||
mach-anw6410.c | ||
mach-crag6410-module.c | ||
mach-crag6410.c | ||
mach-hmt.c | ||
mach-mini6410.c | ||
mach-ncp.c | ||
mach-real6410.c | ||
mach-smartq.c | ||
mach-smartq.h | ||
mach-smartq5.c | ||
mach-smartq7.c | ||
mach-smdk6400.c | ||
mach-smdk6410.c | ||
Makefile | ||
Makefile.boot | ||
pm.c | ||
s3c6400.c | ||
s3c6410.c | ||
setup-fb-24bpp.c | ||
setup-i2c0.c | ||
setup-i2c1.c | ||
setup-ide.c | ||
setup-keypad.c | ||
setup-sdhci-gpio.c | ||
setup-spi.c | ||
sleep.S |