Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel into next
authorJames Morris <james.l.morris@oracle.com>
Wed, 26 Nov 2014 13:35:32 +0000 (00:35 +1100)
committerJames Morris <james.l.morris@oracle.com>
Wed, 26 Nov 2014 13:35:32 +0000 (00:35 +1100)
commitac14ae25b676d721b6bfcfb046dc53a9f7760d83
tree71d0cd79a23bbd744effe37441be2c328399a4e6
parenta6aacbde406eeb6f8fc218b2c6172825f5e73fcf
parent5c1b66240b7f4abc29c618a768121d6a00f4c95a
Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel into next