tree cf6be00ab88b1e315f6b74a896a370440f677599
parent 4739a9748e1bd7459f22f7e94e7d85710ca83954
parent 156171c71a0dc4bce12b4408bb1591f8fe32dc1a
author Eric W. Biederman <ebiederm@xmission.com> 1258448494 -0800
committer Eric W. Biederman <ebiederm@xmission.com> 1258448494 -0800

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.