summaryrefslogtreecommitdiff
path: root/proto_mpls_unicast.c
diff options
context:
space:
mode:
Diffstat (limited to 'proto_mpls_unicast.c')
0 files changed, 0 insertions, 0 deletions
ommit info' class='commit-info'> authorJonathan Corbet <corbet@lwn.net>2016-11-18 16:13:41 -0700 committerJonathan Corbet <corbet@lwn.net>2016-11-18 16:13:41 -0700 commit917fef6f7ee8b2fe852692ac49771342bfef9433 (patch) treeb5932aab90d449841803b6f8679a4564ca2a6eaf /Documentation/devicetree/bindings/reset/reset.txt parent0c9aa209579d41c9b8bf1fc39ce042bea2ec422d (diff)parentbc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff)
Merge tag 'v4.9-rc4' into sound
Bring in -rc4 patches so I can successfully merge the sound doc changes.
Diffstat (limited to 'Documentation/devicetree/bindings/reset/reset.txt')