Merge remote-tracking branch 'audit/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:14:09 +0000 (13:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:14:09 +0000 (13:14 +1100)
1  2 
kernel/audit.c
kernel/audit.h
kernel/audit_tree.c

diff --cc kernel/audit.c
Simple merge
diff --cc kernel/audit.h
Simple merge
Simple merge