git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6461be3
66f32a8
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net...
author
David S. Miller
<davem@davemloft.net>
Sun, 21 Aug 2011 00:25:36 +0000
(17:25 -0700)
committer
David S. Miller
<davem@davemloft.net>
Sun, 21 Aug 2011 00:25:36 +0000
(17:25 -0700)
Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff