git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
67da22d
3e4b945
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Thu, 19 Jul 2012 18:17:30 +0000
(11:17 -0700)
committer
David S. Miller
<davem@davemloft.net>
Thu, 19 Jul 2012 18:17:30 +0000
(11:17 -0700)
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff