From: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue, 17 Nov 2009 09:01:34 +0000 (-0800)
Subject: Merge commit 'v2.6.32-rc7'
X-Git-Tag: v2.6.33-rc1~392^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bb9074ff58fe745e4f244f76209241909c82ec9c;p=users%2Fdwmw2%2Flinux.git

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.
---

bb9074ff58fe745e4f244f76209241909c82ec9c