Merge branch 'sfc-defalconisation-fixups'
authorDavid S. Miller <davem@davemloft.net>
Thu, 1 Dec 2016 20:39:38 +0000 (15:39 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 1 Dec 2016 20:39:38 +0000 (15:39 -0500)
commitb3b9fa0a24a08b14bd44539f79b8902881ece17e
treee01cc4833522569f9fd183253591a58777e7a6d6
parent2934c9dbd385c6be08a1f4a33820d132979d61a7
parent99831b1ea5084d2bd0575d2985e8263f7eee54b7
Merge branch 'sfc-defalconisation-fixups'

Edward Cree says:

====================
sfc: defalconisation fixups

A bug fix, the Kconfig change, and cleaning up a bit more unused code.
====================

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