summaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-02-26 15:55:53 -0500
committerDavid S. Miller <davem@davemloft.net>2014-02-26 15:55:53 -0500
commit53e0b080bce91907fa2cb2118e7ff811998112fc (patch)
treeaf283ea10c11f513859d9ae6e769e5b95a041d96 /drivers/atm
parent0b95227a7ba7e69f795757cd7c839eff0615f2d1 (diff)
parent74cfb2e1f296b3f962016adf41b316b8cf7d4ed4 (diff)
downloadlinux-53e0b080bce91907fa2cb2118e7ff811998112fc.tar.bz2
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 <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
0 files changed, 0 insertions, 0 deletions