diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-29 13:37:31 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-29 13:37:31 +0100 |
commit | d839c98f98826f0c13e46d5a4cecb46dd357b50e (patch) | |
tree | aeffd33ff490a413ef5703cdacdae9f81ee650c9 /crypto/gcm.c | |
parent | a78001b0137e3dd7acb15f6813bf2e5046d2f2ff (diff) | |
parent | 60a8d62b8497c23eb3d48149af7e55dac2dd83a2 (diff) | |
parent | c479163a1b6ab424786fbcd9225b4e3c1c58eb0b (diff) | |
parent | 427ced4b203dfea4f08b1298cd1f88e19039fca4 (diff) |
Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/samsung' and 'asoc/fix/tfa9879' into asoc-linus