git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
785c20a
69204cf
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Wed, 10 Dec 2014 20:48:20 +0000
(15:48 -0500)
committer
David S. Miller
<davem@davemloft.net>
Wed, 10 Dec 2014 20:48:20 +0000
(15:48 -0500)
Conflicts:
drivers/net/ethernet/amd/xgbe/xgbe-desc.c
drivers/net/ethernet/renesas/sh_eth.c
Overlapping changes in both conflict cases.
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff