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
..
88pm8607.c
aat2870-regulator.c
ab3100.c
ab8500.c
ad5398.c
bq24022.c
core.c	Linux 3.3-rc2	2012-02-01 10:08:15 +00:00
da903x.c
da9052-regulator.c
db8500-prcmu.c
dummy.c
dummy.h
fixed.c
gpio-regulator.c
isl6271a-regulator.c
Kconfig
lp3971.c
lp3972.c
Makefile
max1586.c
max8649.c	regulator: Fix getting voltage in max8649_enable_time()	2012-02-10 11:20:55 +00:00
max8660.c
max8925-regulator.c
max8952.c
max8997.c
max8998.c
mc13xxx-regulator-core.c	regulator: Fix mc13xxx regulator modular build (again)	2012-02-09 22:57:46 +00:00
mc13xxx.h
mc13783-regulator.c
mc13892-regulator.c
of_regulator.c	regulator: Set apply_uV only when min and max voltages are defined	2012-01-26 11:01:21 +00:00
pcap-regulator.c
pcf50633-regulator.c
tps6105x-regulator.c
tps6507x-regulator.c
tps6524x-regulator.c
tps6586x-regulator.c
tps65023-regulator.c
tps65910-regulator.c
tps65912-regulator.c
twl-regulator.c
userspace-consumer.c
virtual.c
wm831x-dcdc.c
wm831x-isink.c
wm831x-ldo.c
wm8350-regulator.c
wm8400-regulator.c
wm8994-regulator.c