Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...
authorJames Morris <james.l.morris@oracle.com>
Fri, 23 Oct 2015 01:07:52 +0000 (12:07 +1100)
committerJames Morris <james.l.morris@oracle.com>
Fri, 23 Oct 2015 01:07:52 +0000 (12:07 +1100)
commitba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7
tree8f94d0fcb68cdcff0d00a7911ddb494705cf7c72
parenta47c7a6c8aff0563c0ef4adf299268f3c27af0f6
parent146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc
Merge tag 'keys-next-20151021' of git://git./linux/kernel/git/dhowells/linux-fs into next