summaryrefslogtreecommitdiff
path: root/promisc.c
diff options
context:
space:
mode:
Diffstat (limited to 'promisc.c')
0 files changed, 0 insertions, 0 deletions
a87d790997a1dca0ff'>diff)parent04974df8049fc4240d22759a91e035082ccd18b4 (diff)
Merge tag 'v4.6-rc6' into ras/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat