]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sysctl/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:41:09 +0000 (13:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:41:09 +0000 (13:41 +1100)
1  2 
fs/proc/proc_sysctl.c

Simple merge