Merge commit 'v3.5-rc2' into next
authorJames Morris <james.l.morris@oracle.com>
Sun, 10 Jun 2012 12:52:10 +0000 (22:52 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sun, 10 Jun 2012 12:52:10 +0000 (22:52 +1000)
commit66dd07b88a1c9d446f32253da606b87324fa620e
tree4e0971bdd543585c7ab46716ae808a7fd82f9c35
parentf52c44cd27b4a0be37ef97f0466e4095ebebef3f
parentcfaf025112d3856637ff34a767ef785ef5cf2ca9
Merge commit 'v3.5-rc2' into next
lib/Kconfig
security/keys/compat.c
security/keys/internal.h
security/keys/keyctl.c