Sync to Linus v4.4-rc2 for LSM developers.
authorJames Morris <james.l.morris@oracle.com>
Mon, 23 Nov 2015 11:46:28 +0000 (22:46 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 23 Nov 2015 11:46:28 +0000 (22:46 +1100)

Trivial merge