summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/r8152.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-02-18 16:23:58 -0500
committerDavid S. Miller <davem@davemloft.net>2014-02-18 16:23:58 -0500
commitb0b9ad71f3a292cb8d38939b20b2fcde4d29b4cd (patch)
tree6a0d8afbf3223ab2c45c775f9d3f04fef8a6b566 /drivers/net/usb/r8152.c
parent9fa9e49829fc4628ffb3c1d613f6e52bcbf59480 (diff)
parentf0a8e6dea0f6785e84673f5f9ddb620de5447aba (diff)
downloadtalos-obmc-linux-b0b9ad71f3a292cb8d38939b20b2fcde4d29b4cd.tar.gz
talos-obmc-linux-b0b9ad71f3a292cb8d38939b20b2fcde4d29b4cd.zip
Merge branch 'cxgb4'
Hariprasad Shenai says: ==================== Adds support for Chelsio T5 40G adapter and Misc. fixes This patch series adds support for Chelsio T5 40G adapters and provides miscelleneous fixes for cxgb4 driver. It also adds device ids of two new T5 adapters. We would like to request this patch series to get merged via David Miller's 'net-next' tree. We have included all the maintainers of respective drivers. Kindly review the change and let us know in case of any review comments. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/r8152.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud