summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2009-11-17 10:01:34 +0100
committerEric W. Biederman <ebiederm@xmission.com>2009-11-17 10:01:34 +0100
commitbb9074ff58fe745e4f244f76209241909c82ec9c (patch)
treecf6be00ab88b1e315f6b74a896a370440f677599 /arch/mips/kernel
parentsysctl: Remove the last of the generic binary sysctl support (diff)
parentLinux 2.6.32-rc7 (diff)
downloadlinux-bb9074ff58fe745e4f244f76209241909c82ec9c.tar.xz
linux-bb9074ff58fe745e4f244f76209241909c82ec9c.zip
Merge commit 'v2.6.32-rc7'
Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler gets a small bug fix and the sysctl tree where I am removing all sysctl strategy routines.
Diffstat (limited to 'arch/mips/kernel')
0 files changed, 0 insertions, 0 deletions