From: David S. Miller <davem@davemloft.net>
Date: Mon, 23 Jun 2014 04:13:38 +0000 (-0700)
Subject: Merge branch 'cxgb4-next'
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~149^2~272
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47cc3b4f0f5956055672ce89366ef17c03597087;p=pandora-kernel.git

Merge branch 'cxgb4-next'

Anish Bhatt says:

====================
cxgb4 : Add DCBx support to Chelsio cxgb4 driver

This patchset adds support for DCBx via dcbnl_ops to the cxgb4
driver. This should enable cxgb4 to work with open-lldp and the
like. The last patch only updates copyright year.

v2 : move inclusion of struct port_dcb_info to the same patch as where it is defined.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

47cc3b4f0f5956055672ce89366ef17c03597087