git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b6f4098
e92427b
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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)
Conflicts:
net/sched/sch_hfsc.c
net/sched/sch_htb.c
net/sched/sch_tbf.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff