]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sysctl/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Aug 2011 03:34:17 +0000 (13:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Aug 2011 03:34:17 +0000 (13:34 +1000)
1  2 
fs/proc/proc_sysctl.c

Simple merge