Skip to content
Commit bb9074ff authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

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.
parents 4739a974 156171c7
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment