summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-11-08 10:55:48 +0100
committerIngo Molnar <mingo@kernel.org>2017-11-08 10:55:48 +0100
commit93c08089c06da402394605223b4faa73fe3730d2 (patch)
tree77d033546c3172a6d09d85b50005213f1d4884de /net
parent9275b933d409d3a4efa08102ca813557b93fb0b9 (diff)
parent71271269ef9a997fb4416b2f8ef3558dd846c7cb (diff)
downloadop-kernel-dev-93c08089c06da402394605223b4faa73fe3730d2.zip
op-kernel-dev-93c08089c06da402394605223b4faa73fe3730d2.tar.gz
Merge branch 'x86/mpx' into x86/asm, to pick up dependent commits
The UMIP series is based on top of changes already queued up in the x86/mpx branch, so merge it. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud