From: David S. Miller Date: Wed, 26 Feb 2014 20:55:53 +0000 (-0500) Subject: Merge branch 'intel-next' X-Git-Tag: firefly_0821_release~176^2~4167^2~255 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=53e0b080bce91907fa2cb2118e7ff811998112fc;p=firefly-linux-kernel-4.4.55.git Merge branch 'intel-next' Aaron Brown says: ==================== Intel Wired LAN Driver Updates This series contains updates to ixgbe, igb and documentation. The first four have been sent up as part of other series where 1 or more in the series were rejected and either dropped or still being worked on for reasons unrelated to these patches. Don makes recovery from a HW ECC error just schedule a reset as it turns out the previous behaviour of forcing the user to reload is not necessary. Mark adds WoL support to port 0 of a new device. Jacob removes a magic number from the ptp_caps.name and updates the SubmittingPatches documentation with details on the Fixed: tag. And Carolyn updates igb files to remove the FSF physical mail address. [ DaveM Note: SubmittingPatches change omitted, will go via LKML ] ==================== Signed-off-by: David S. Miller --- 53e0b080bce91907fa2cb2118e7ff811998112fc