ator' content='cgit v1.2.3-54-g00ecf'/>
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2016-11-30 17:46:23 -0700
committerJonathan Corbet <corbet@lwn.net>2016-11-30 17:46:23 -0700
commit2fc9254d0c473e26a668d8efc75dd71146a07852 (patch)
tree70a341f1fe80735c59003f682da0bfef5d1e162e
parentc3396656666c2c98db306dc91c480d9fbde35cc9 (diff)
parent326bc876fed4fad2f46dd1be637e90e1b525ee8c (diff)
Merge branch 'silvio' into docs-next