git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30129cf
3da889b
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Tue, 12 Mar 2013 09:52:22 +0000
(
05:52
-0400)
committer
David S. Miller
<davem@davemloft.net>
Tue, 12 Mar 2013 09:52:22 +0000
(
05:52
-0400)
Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c
Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff