aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm_tis.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-11 20:07:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-11 20:07:47 -0800
commit7184487f14eb7c2fcf8337bb16c6a63b6db1252e (patch)
tree95bd179196eb98fa2c31bbcacd782db80be44f3e /drivers/char/tpm/tpm_tis.c
parentMerge branch 'akpm' (patches from Andrew) (diff)
parentaudit: remove vestiges of vers_ops (diff)
downloadlinux-dev-7184487f14eb7c2fcf8337bb16c6a63b6db1252e.tar.xz
linux-dev-7184487f14eb7c2fcf8337bb16c6a63b6db1252e.zip
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
Pull audit fix from Paul Moore: "Just one patch from the audit tree for v3.20, and a very minor one at that. The patch simply removes an old, unused field from the audit_krule structure, a private audit-only struct. In audit related news, we did a proper overhaul of the audit pathname code and removed the nasty getname()/putname() hacks for audit, you should see those patches in Al's vfs tree if you haven't already. That's it for audit this time, let's hope for a quiet -rcX series" * 'upstream' of git://git.infradead.org/users/pcmoore/audit: audit: remove vestiges of vers_ops
Diffstat (limited to 'drivers/char/tpm/tpm_tis.c')
0 files changed, 0 insertions, 0 deletions