summaryrefslogtreecommitdiff
path: root/arch/x86/mm/mem_encrypt_boot.S
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-12 20:04:01 +0000
committerMark Brown <broonie@kernel.org>2018-01-12 20:04:01 +0000
commita75de77211842a7e120ce95ad156e4b3704dcde7 (patch)
tree11710e12d7ed68d99313799cde484e9b40b78b81 /arch/x86/mm/mem_encrypt_boot.S
parent757b65285f366cb8d410333b03a502aab0c3689a (diff)
parent7c22ce6e218403fc8746f7915b5a391d8227f7e1 (diff)
parent9bf485c955bcb707a5e679bcc74075deb0bc8531 (diff)
Merge remote-tracking branches 'regmap/topic/soundwire' and 'regmap/topic/zero' into regmap-next