aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm_i2c_stm_st33.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-07-30 01:31:46 +1000
committerJames Morris <james.l.morris@oracle.com>2014-07-30 01:31:46 +1000
commit167225b775d47954d702db4743f9d918aabab0a8 (patch)
treee03a05550c87c702fe4c746dd156a8bd38de3651 /drivers/char/tpm/tpm_i2c_stm_st33.c
parentKEYS: revert encrypted key change (diff)
parentRevert "selinux: fix the default socket labeling in sock_graft()" (diff)
downloadlinux-dev-167225b775d47954d702db4743f9d918aabab0a8.tar.xz
linux-dev-167225b775d47954d702db4743f9d918aabab0a8.zip
Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions