git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8ac467e
affb817
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Tue, 10 Mar 2015 03:38:02 +0000
(23:38 -0400)
committer
David S. Miller
<davem@davemloft.net>
Tue, 10 Mar 2015 03:38:02 +0000
(23:38 -0400)
Conflicts:
drivers/net/ethernet/cadence/macb.c
Overlapping changes in macb driver, mostly fixes and cleanups
in 'net' overlapping with the integration of at91_ether into
macb in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff