Merge branch 'bnxt_en-zeropad-fw-and-reset'
authorDavid S. Miller <davem@davemloft.net>
Mon, 11 Jan 2016 03:19:19 +0000 (22:19 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Jan 2016 03:19:19 +0000 (22:19 -0500)
Michael Chan says:

====================
bnxt_en: Zero pad fw messages and add fw reset.

2 patches related to firmware for net-next.
====================

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

Trivial merge