tree 71d0cd79a23bbd744effe37441be2c328399a4e6
parent a6aacbde406eeb6f8fc218b2c6172825f5e73fcf
parent 5c1b66240b7f4abc29c618a768121d6a00f4c95a
author James Morris <james.l.morris@oracle.com> 1417008932 +1100
committer James Morris <james.l.morris@oracle.com> 1417008932 +1100

Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel into next