Merge branch 'xen-netfront'
authorDavid S. Miller <davem@davemloft.net>
Sat, 21 Jun 2014 23:15:04 +0000 (16:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Jun 2014 23:15:04 +0000 (16:15 -0700)
commit7f082319190bce121c9774956861c2457535ef2d
tree0c2b20bc313a7e0b292904e2352b7ac72719044a
parenta705a906c617b1c389729829c0a160f179d043bf
parentce58725fec6e609eee162e6af848bd57107b97af
Merge branch 'xen-netfront'

David Vrabel says:

====================
xen-netfront: fix resume regressions in 3.16-rc1

The introduction of multi-queue support to xen-netfront in 3.16-rc1,
broke resume/migration.
====================

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