From: David S. Miller <davem@davemloft.net>
Date: Tue, 18 Mar 2014 20:03:44 +0000 (-0400)
Subject: Merge branch 'cnic-net'
X-Git-Tag: v3.14-rc8~3^2~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0df04c4ccc77da2cf2df93c5c935a97413e5822b;p=~emulex%2Finfiniband.git

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>
---

0df04c4ccc77da2cf2df93c5c935a97413e5822b