OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
358b838
ea99d83
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
author
David S. Miller
<davem@davemloft.net>
Wed, 16 Nov 2011 23:31:56 +0000
(18:31 -0500)
committer
David S. Miller
<davem@davemloft.net>
Wed, 16 Nov 2011 23:31:56 +0000
(18:31 -0500)
1
2
drivers/net/ethernet/intel/e1000e/netdev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/igb/igb_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/igbvf/netdev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge
diff --cc
drivers/net/ethernet/intel/igb/igb_main.c
Simple merge
diff --cc
drivers/net/ethernet/intel/igbvf/netdev.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge