| commit | 0df04c4ccc77da2cf2df93c5c935a97413e5822b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Mar 18 16:03:44 2014 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Tue Mar 18 16:03:44 2014 -0400 |
| tree | 8e172890c068aa444029779ea39570e6941a98eb | |
| parent | ff0992e9036e9810e7cd45234fa32ca1e79750e2 [diff] | |
| parent | c3661283f947ff5023b717240d069e9be765b0a9 [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>