aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/slow-work.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2009-11-17 01:01:34 -0800
committerEric W. Biederman <ebiederm@xmission.com>2009-11-17 01:01:34 -0800
commitbb9074ff58fe745e4f244f76209241909c82ec9c (patch)
treecf6be00ab88b1e315f6b74a896a370440f677599 /kernel/slow-work.c
parent4739a9748e1bd7459f22f7e94e7d85710ca83954 (diff)
parent156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff)
downloadmrst-s0i3-test-bb9074ff58fe745e4f244f76209241909c82ec9c.tar.gz
mrst-s0i3-test-bb9074ff58fe745e4f244f76209241909c82ec9c.tar.xz
mrst-s0i3-test-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 'kernel/slow-work.c')
0 files changed, 0 insertions, 0 deletions