Merge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 18 Sep 2014 13:52:46 +0000 (23:52 +1000)
committerJames Morris <james.l.morris@oracle.com>
Thu, 18 Sep 2014 13:52:46 +0000 (23:52 +1000)
commit6f98e892884c32b9273ecce1332b849bcad3b8b1
tree400e8ae29e555753e0ec085bf452f7206eb8c159
parentac60ab4b4968b54fb5af20eac9dd78e36ad910c1
parent21c7eae21a2100a89cfb8cebaf7b770271f32c6e
Merge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel into next