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.

diff --cc drivers/md/md.c
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc net/netfilter/nf_conntrack_proto_tcp.c
Simple merge