Merge commit 'v2.6.32-rc7'
Eric W. Biederman [Tue, 17 Nov 2009 09:01:34 +0000 (01:01 -0800)]
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.

1  2 
drivers/md/md.c
init/Kconfig
kernel/sched.c
net/netfilter/nf_conntrack_proto_tcp.c

diff --cc drivers/md/md.c
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/sched.c
Simple merge