Merge branch 'r6040-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 Jul 2016 07:10:30 +0000 (00:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Jul 2016 07:10:30 +0000 (00:10 -0700)
commit9046a745e29aa4c7e4f1dda3a50199dbe62fc9e8
treef118259d55ff9512109eeb38f29e8f77134e11b0
parent6ebd1a6d74d5fb684ce9a48ee978e94588ecf502
parent9da280413a2a7e03b38c880cf3e7e0c16dd7371b
Merge branch 'r6040-next'

Florian Fainelli says:

====================
net: r6040: Misc updates

Here are some various updates for the r6040 driver, mostly to make it more
modern and catch up with the latest API improvements.
====================

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