diff options
author | 2014-03-18 16:03:44 -0400 | |
---|---|---|
committer | 2014-03-18 16:03:44 -0400 | |
commit | 0df04c4ccc77da2cf2df93c5c935a97413e5822b (patch) | |
tree | 8e172890c068aa444029779ea39570e6941a98eb /tools/perf/scripts/python/export-to-postgresql.py | |
parent | net: cdc_ncm: fix control message ordering (diff) | |
parent | cnic: Update version to 2.5.20 and copyright year. (diff) | |
download | linux-dev-0df04c4ccc77da2cf2df93c5c935a97413e5822b.tar.xz linux-dev-0df04c4ccc77da2cf2df93c5c935a97413e5822b.zip |
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>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions