Merge tag 'asn1-fixes-20150805' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJames Morris <james.l.morris@oracle.com>
Fri, 7 Aug 2015 03:27:58 +0000 (13:27 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 7 Aug 2015 03:27:58 +0000 (13:27 +1000)

Trivial merge