]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sysctl/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Aug 2011 02:21:13 +0000 (12:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Aug 2011 02:21:13 +0000 (12:21 +1000)
1  2 
fs/proc/proc_sysctl.c

Simple merge