git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c075b13
a375413
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Sat, 10 Nov 2012 23:32:51 +0000
(18:32 -0500)
committer
David S. Miller
<davem@davemloft.net>
Sat, 10 Nov 2012 23:32:51 +0000
(18:32 -0500)
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net. Based upon a conflict resolution
patch posted by Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff