Merge branch 'qed-get_regs'
authorDavid S. Miller <davem@davemloft.net>
Tue, 6 Sep 2016 21:24:02 +0000 (14:24 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Sep 2016 21:24:02 +0000 (14:24 -0700)

Trivial merge