summaryrefslogtreecommitdiff
path: root/proto_ipv6_routing.c
diff options
context:
space:
mode:
Diffstat (limited to 'proto_ipv6_routing.c')
0 files changed, 0 insertions, 0 deletions
td>parent748c7201e622d1c24abb4f85072d2e74d12f295f (diff)
Merge branch 'sched/core' into timers/nohz, to avoid conflicts in upcoming patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat