Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel...
authorJames Morris <james.l.morris@oracle.com>
Mon, 16 Feb 2015 02:47:53 +0000 (13:47 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 16 Feb 2015 02:47:53 +0000 (13:47 +1100)
commit0d309cbddb49d4d948b3e9fe8423e80b3b64486b
tree80c2de7fa46339120d458e033612a9c71625d856
parentd0709f1e66e8066c4ac6a54620ec116aa41937c0
parent7f368ad34f0657f4bc39bf5bad6692b5a81a1194
Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel into for-linus