diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-27 14:07:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-27 14:07:55 -0400 |
| commit | fe2d2c208d3cdde37852bdc2f82788134d99de85 (patch) | |
| tree | 56dd7ba9fc7f625a2828164eb12a052fd465dbdd /drivers/input/misc/ad714x-i2c.c | |
| parent | 0fb031f036385af1e1de87ac3e98a2afba2139ae (diff) | |
| parent | 37287fae7e4506fb0822523587c769783164cdd6 (diff) | |
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 <davem@davemloft.net>
Diffstat (limited to 'drivers/input/misc/ad714x-i2c.c')
0 files changed, 0 insertions, 0 deletions