]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 06081ce 5ad2e7d)
Merge branch 'cnic-net'
authorDavid S. Miller <davem@davemloft.net>
Tue, 18 Mar 2014 20:03:44 +0000 (16:03 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Mar 2014 20:03:44 +0000 (16:03 -0400)
commitbce9e0cb5fe83f670868e09ab3eabcab95ba1f43
tree8e172890c068aa444029779ea39570e6941a98ebtree | snapshot
parent06081ce98bb33f8a3820ba335dc01d6c1ace62a1commit | diff
parent5ad2e7d57d8a613dca6e6982f18e91e817464632commit | diff
Merge branch 'cnic-net'

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>
Linux Kernel Source Tree.