tree 2e01de06d4740300cfcfbb9e9f9fd3b7078dd3ce
parent 874ff01bd9183ad16495acfd54e93a619d12b8b5
parent db3495099d3d52854b13874905af6e40a91f4721
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1171920594 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171920594 -0800

Merge branch 'audit.b37' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current

* 'audit.b37' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] AUDIT_FD_PAIR
  [PATCH] audit config lockdown
  [PATCH] minor update to rule add/delete messages (ver 2)