Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM
authorJames Morris <james.l.morris@oracle.com>
Mon, 6 Jan 2014 11:23:01 +0000 (22:23 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 6 Jan 2014 11:23:01 +0000 (22:23 +1100)
commit38fd2c202a3d82bc12430bce5789fa2c2a406f71
treea73513dbb015155f5236b391709b9083916b3136
parentdcf4e392867bf98d50ad108ed7c2bfb941e8c33d
parentd6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc
Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM
security/integrity/ima/ima_template_lib.c