Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM

author James Morris <james.l.morris@oracle.com>

Mon, 6 Jan 2014 11:23:01 +0000 (22:23 +1100)

committer James Morris <james.l.morris@oracle.com>

Mon, 6 Jan 2014 11:23:01 +0000 (22:23 +1100)
author James Morris <james.l.morris@oracle.com>
Mon, 6 Jan 2014 11:23:01 +0000 (22:23 +1100)
committer James Morris <james.l.morris@oracle.com>
Mon, 6 Jan 2014 11:23:01 +0000 (22:23 +1100)
diff --cc security/integrity/ima/ima_template_lib.c
Simple merge
author	James Morris <james.l.morris@oracle.com>
	Mon, 6 Jan 2014 11:23:01 +0000 (22:23 +1100)
committer	James Morris <james.l.morris@oracle.com>
	Mon, 6 Jan 2014 11:23:01 +0000 (22:23 +1100)