From: David S. Miller Date: Sun, 3 Feb 2013 03:55:16 +0000 (-0500) Subject: Merge branch 'intel' X-Git-Tag: v3.9-rc1~139^2~197 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=daef2262a730144af851ef352b003ecadbdff005;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branch 'intel' Jeff Kirsher says: ==================== This series contains updates to ixgbe and e1000e. The ixgbe patches are a mix of fixes, cleanup and added functionality. The first fix is for traffic classes, where if the mapping has changed reset the NIC. The other ixgbe fix resolves an issue where the device lookup neglected to do a pci_dev_put() to decrement the device reference count. The ixgbe cleanup was done by Josh, where the auto-negotiation variables were renamed/cleaned up and refactored. The remaining patches are from Bruce to do additional cleanup on e1000e as well as bump the driver version. Most notably is the cleanup to use the kernel IEEE MII definitions where possible instead of the local MII definitions. ==================== Signed-off-by: David S. Miller --- daef2262a730144af851ef352b003ecadbdff005