summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-09-15 09:52:21 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-09-15 09:52:21 -0700
commitbbc8608755da42e7494c00dce24a636007972def (patch)
tree7db003ee57a435042dedfa6664aef31c24922c04 /.gitattributes
parenta6cbfa1e6d38c4b3ab0ce7e3aea4bb4e744f24b8 (diff)
parent697c5d8a36768b36729533fb44622b35d56d6ad0 (diff)
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.14 merge window.
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions