From: David S. Miller <davem@davemloft.net>
Date: Sat, 13 Sep 2014 21:32:29 +0000 (-0400)
Subject: Merge branch 'fec-next'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=45f85a2565a9ba4ab4dc095d4d32c4cd2a56b168;p=deliverable%2Flinux.git

Merge branch 'fec-next'

Frank Li says:

====================
net: fec: imx6sx multiqueue support

These patches enable i.MX6SX multi queue support.
i.MX6SX support 3 queue and AVB feature.

Change from v3 to v4
 - use "unsigned int" instead of "unsigned"

Change from v2 to v3
 - fixed alignment requirement for ARM and NO-ARM platform

Change from v1 to v2.
 - Change num_tx_queue to unsigned int
 - Avoid block non-dt platform
 - remove call netif_set_real_num_rx_queues
 - seperate multi queue patch two part, one is tx and rx handle, with fixed queue 0
   then other one is initilized multiqueue
 - use two difference alignment for tx and rx path
====================

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

45f85a2565a9ba4ab4dc095d4d32c4cd2a56b168