git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4739a97 156171c)

author	Eric W. Biederman <ebiederm@xmission.com>
	Tue, 17 Nov 2009 09:01:34 +0000 (01:01 -0800)
committer	Eric W. Biederman <ebiederm@xmission.com>
	Tue, 17 Nov 2009 09:01:34 +0000 (01:01 -0800)
commit	bb9074ff58fe745e4f244f76209241909c82ec9c
tree	cf6be00ab88b1e315f6b74a896a370440f677599	tree \| snapshot
parent	4739a9748e1bd7459f22f7e94e7d85710ca83954	commit \| diff
parent	156171c71a0dc4bce12b4408bb1591f8fe32dc1a	commit \| diff

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.

drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_proto_tcp.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree