review.tizen.org Git - platform/adaptation/renesas_rcar/renesas_kernel.git/commit

projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b6f4098 e92427b)

author	David S. Miller <davem@davemloft.net>
	Mon, 24 Jan 2011 22:09:35 +0000 (14:09 -0800)
committer	David S. Miller <davem@davemloft.net>
	Mon, 24 Jan 2011 22:09:35 +0000 (14:09 -0800)
commit	5bdc22a56549e7983c6b443298672641952ea035
tree	fbfd4e7453e4fd23dfef826d4610ed2aae47b36c	tree \| snapshot
parent	b6f4098897f30b7ea90a1c1edf35e9b20a9d828a	commit \| diff
parent	e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb	commit \| diff

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/sched/sch_hfsc.c
net/sched/sch_htb.c
net/sched/sch_tbf.c

17 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_cbq.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_dsmark.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_fifo.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_hfsc.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_htb.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_multiq.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_netem.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_prio.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_red.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_sfq.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_tbf.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_teql.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;