summaryrefslogtreecommitdiffstats
path: root/arch/s390/crypto
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-09-30 13:50:29 +0100
committerMark Brown <broonie@kernel.org>2014-09-30 13:50:29 +0100
commit64b285ad7b03af498fbf2e6c0a143dd7b506ffba (patch)
tree000a108103555c2957322d8920a177cbf3c018b6 /arch/s390/crypto
parenta81bf3c4fc391ec10696d448408c1ac83bfb6112 (diff)
parent5ccedf03427ec71ab29a8bd77110242a605085a5 (diff)
parentda0bb557ba0b5985631a98b7450d256251e7fb5d (diff)
parentef126a4a8112998a9d4dcea166781331f1020f76 (diff)
Merge remote-tracking branches 'regulator/topic/max1586', 'regulator/topic/max77802' and 'regulator/topic/of' into regulator-next