projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d5ef8a4
4031ae6
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
author
David S. Miller
<davem@davemloft.net>
Sun, 12 Feb 2012 22:05:16 +0000
(17:05 -0500)
committer
David S. Miller
<davem@davemloft.net>
Sun, 12 Feb 2012 22:05:16 +0000
(17:05 -0500)
1
2
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge
projects / kernel / kernel-generic.git / commitdiff