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

Simple merge