diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-03-28 10:56:32 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-03-28 10:58:28 +0100 |
commit | cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb (patch) | |
tree | 52591d7b53600d5d39369525a356ccb81e22fcd9 /virt | |
parent | proc/kcore: Remove unused kclist_add_remap() (diff) | |
parent | Linux 5.1-rc2 (diff) | |
download | wireguard-linux-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.tar.xz wireguard-linux-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.zip |
Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
Conflicts:
include/linux/kcore.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions