projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ff0992e c366128)
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)
commit0df04c4ccc77da2cf2df93c5c935a97413e5822b
tree8e172890c068aa444029779ea39570e6941a98ebtree | snapshot
parentff0992e9036e9810e7cd45234fa32ca1e79750e2commit | diff
parentc3661283f947ff5023b717240d069e9be765b0a9commit | 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 tree with some unpolished code for Colibri/Apalis modules