Merge tag 'v3.6-rc7' into next
authorJames Morris <james.l.morris@oracle.com>
Fri, 28 Sep 2012 03:37:32 +0000 (13:37 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 28 Sep 2012 03:37:32 +0000 (13:37 +1000)
commitbf5308344527d015ac9a6d2bda4ad4d40fd7d943
tree566e61e2cfc648c374d15cfc8c661b73e1a471f8
parent3585e96cd1049682b8a19a0b699422156e9d735b
parent979570e02981d4a8fc20b3cc8fd651856c98ee9d
Merge tag 'v3.6-rc7' into next

Linux 3.6-rc7

Requested by David Howells so he can merge his key susbsystem work into
my tree with requisite -linus changesets.
security/yama/yama_lsm.c