git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3b254c5
3ee9437
)
Merge branch 'master' of /repos/git/net-next-2.6
author
Patrick McHardy
<kaber@trash.net>
Mon, 10 May 2010 16:39:28 +0000
(18:39 +0200)
committer
Patrick McHardy
<kaber@trash.net>
Mon, 10 May 2010 16:39:28 +0000
(18:39 +0200)
Conflicts:
net/bridge/br_device.c
net/bridge/br_forward.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff