Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Sep 2009 15:31:04 +0000 (08:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Sep 2009 15:31:04 +0000 (08:31 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  lsm: Use a compressed IPv6 string format in audit events
  Audit: send signal info if selinux is disabled
  Audit: rearrange audit_context to save 16 bytes per struct
  Audit: reorganize struct audit_watch to save 8 bytes


Trivial merge