Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 14 Jan 2016 01:11:58 +0000 (12:11 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 14 Jan 2016 01:11:58 +0000 (12:11 +1100)
commitacb2cfdb316ddc3fac8183c0f71edd1680713b10
treece94b3236d6b60dc67334ad30e938b8fd8ad80de
parent607259e17b37017e9ec0249a8b0a7d8b76b572aa
parentb197367ed1ba81b0d26f7e7f76f61731ac6e5842
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next