]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'smack-for-4.12' of git://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 18 Apr 2017 22:35:01 +0000 (08:35 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 18 Apr 2017 22:35:01 +0000 (08:35 +1000)

Trivial merge