Merge remote-tracking branch 'audit/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 8 Mar 2016 02:04:59 +0000 (13:04 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 8 Mar 2016 02:04:59 +0000 (13:04 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 02:04:59 +0000 (13:04 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 02:04:59 +0000 (13:04 +1100)
diff --cc kernel/audit.c
Simple merge
diff --cc kernel/audit_watch.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 8 Mar 2016 02:04:59 +0000 (13:04 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 8 Mar 2016 02:04:59 +0000 (13:04 +1100)
		1	2
kernel/audit.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/audit_watch.c	patch \|	diff1 \|	diff2 \|	blob \| history