tree 6093a86c9e704ebfed54adb426ff3079a428da93
parent 485372dc24ca2eaac18ce41a51b9dd017bc11400
parent 9eccca0843205f87c00404b663188b88eb248051
author Mark Brown <broonie@kernel.org> 1425983822 +0000
committer Mark Brown <broonie@kernel.org> 1425983822 +0000
mergetag object 9eccca0843205f87c00404b663188b88eb248051
 type commit
 tag v4.0-rc3
 tagger Linus Torvalds <torvalds@linux-foundation.org> 1425856156 -0700
 
 Linux 4.0-rc3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJU/NacAAoJEHm+PkMAQRiGdUcIAJU5dHclwd9HRc7LX5iOwYN6
 mN0aCsYjMD8Pjx2VcPCgJvkIoESQO5pkwYpFFWCwILup1bVEidqXfr8EPOdThzdh
 kcaT0FwUvd19K+0jcKVNCX1RjKBtlUfUKONk6sS2x4RrYZpv0Ur8Gh+yXV8iMWtf
 fAusNEYlxQJvEz5+NSKw86EZTr4VVcykKLNvj+/t/JrXEuue7IG8EyoAO/nLmNd2
 V/TUKKttqpE6aUVBiBDmcMQl2SUVAfp5e+KJAHmizdDpSE80nU59UC1uyV8VCYdM
 qwHXgttLhhKr8jBPOkvUxl4aSXW7S0QWO8TrMpNdEOeB3ZB8AKsiIuhe1JrK0ro=
 =Xkue
 -----END PGP SIGNATURE-----

Merge tag 'v4.0-rc3' into asoc-rt5670

Linux 4.0-rc3

Conflicts:
	sound/soc/codecs/rt5670.c