tree e7c47e2e9aa8f6184cb5b20bde2e4fda96a3bb59
parent f141822b15635daa94610c5527806fa315f59f4d
parent 6887a4131da3adaab011613776d865f4bcfb5678
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1341249899 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1341249899 +0100
mergetag object 6887a4131da3adaab011613776d865f4bcfb5678
 type commit
 tag v3.5-rc5
 tagger Linus Torvalds <torvalds@linux-foundation.org> 1341097756 -0700
 
 Linux 3.5-rc5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJP74cgAAoJEHm+PkMAQRiG1mMH/A1uPaF6CZhyaDHRYAdlxzIl
 OQ5FJNlX1vzPZg6VLiNi4KxcbfgVrVSU6oghD6ASmoWje7PkhbzzoJVeUu9DYbbQ
 oz/IXJi/SqYMhbZvqZ4DsCY25sZNWsWfeabs38hil9BEaxj6xOqF1iR0RUrvcRoP
 K6kyYUNk2C7q8w/ouco5kmIcEWf6xD4bJWInyL5r/VGpRnNeZewFfsHoZ8tUWxwA
 ndsD45njKqnSHfBTipkVMXanHZQC0rpwLi+Rxv/+yBlQdDFVxD+RFrjLmV98XKLb
 dFZzV9WiuiMM1qnwiolQYMNUT8ZJYLzy04duG8wGqwzh5rWo3tv+01wAbAtTFvg=
 =4UfY
 -----END PGP SIGNATURE-----

Merge tag 'v3.5-rc5' into regulator-drivers

Linux 3.5-rc5 collides with further development.

Conflicts:
	drivers/regulator/tps65023-regulator.c