From: David S. Miller Date: Wed, 27 Mar 2013 18:07:55 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net X-Git-Tag: v3.9-rc6~38^2~21 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fe2d2c208d3cdde37852bdc2f82788134d99de85;p=~emulex%2Finfiniband.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net Jeff Kirsher says: ==================== This series contains updates to e1000, ixgb and e1000e for Christoph. Christoph provides 3 patches to resolve missing dma_error_call's to provided Intel drivers which did not have this fix. ==================== Signed-off-by: David S. Miller --- fe2d2c208d3cdde37852bdc2f82788134d99de85