OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ff0992e
c366128
)
Merge branch 'cnic-net'
author
David S. Miller
<davem@davemloft.net>
Tue, 18 Mar 2014 20:03:44 +0000
(16:03 -0400)
committer
David S. Miller
<davem@davemloft.net>
Tue, 18 Mar 2014 20:03:44 +0000
(16:03 -0400)
Michael Chan says:
====================
cnic bug fixes for net-next
Michael Chan (3):
cnic: Use proper ulp_ops for per device operations.
cnic,bnx2i,bnx2fc: Fix inconsistent use of page size
cnic: Update version to 2.5.20 and copyright year.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge