From: Linus Torvalds Date: Mon, 24 Jan 2011 09:56:47 +0000 (+1000) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Tag: v4.13~16062 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d20761a7995773dfae4a54fdd26a7857b861adb5;p=mirror_ubuntu-bionic-kernel.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: selinux: return -ENOMEM when memory allocation fails tpm: fix panic caused by "tpm: Autodetect itpm devices" TPM: Long default timeout fix trusted keys: Fix a memory leak in trusted_update(). keys: add trusted and encrypted maintainers encrypted-keys: rename encrypted_defined files to encrypted trusted-keys: rename trusted_defined files to trusted --- d20761a7995773dfae4a54fdd26a7857b861adb5