summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2017-06-21 11:30:20 +1000
committerJames Morris <james.l.morris@oracle.com>2017-06-21 11:30:20 +1000
commitcdac74ddf28e2f07319cc89446f9dea35d22d999 (patch)
treea834000d6eef03e194cc40a964191e583595b5b8 /.mailmap
parente4b0852798bc15ed1a3ed6768ef2c4d2a1cb7599 (diff)
parentf28e783ff668cf5757182f6b00d488be37226bff (diff)
downloadlinux-cdac74ddf28e2f07319cc89446f9dea35d22d999.tar.bz2
Merge branch 'smack-for-4.13' of git://github.com/cschaufler/smack-next into next
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions