]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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)
Linux 3.6-rc7

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

1  2 
security/yama/yama_lsm.c

Simple merge