]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'openrisc/for-upstream'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:14:23 +0000 (10:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:14:23 +0000 (10:14 +1100)
1  2 
include/linux/audit.h

Simple merge