tree 537e9498c9faebd46f513598a212d06fb1c32a23
parent d4a141c8e77043bd674dd6aa0b40bc3675cb7b1d
parent a3aef94b312ec51b5dfc199ef884924e60ad1b75
author James Morris <james.l.morris@oracle.com> 1394602428 +1100
committer James Morris <james.l.morris@oracle.com> 1394602428 +1100

Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next