diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-15 17:19:04 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-15 17:19:04 (GMT) |
| commit | 56845d78cee8576a8160cee8aeac62efdb561ae2 (patch) | |
| tree | f891afed5324d359da1713a80a7131968373acc4 /drivers/firmware | |
| parent | df8ef8f3aaa6692970a436204c4429210addb23a (diff) | |
| parent | 8a9a0ea6032186e3030419262678d652b88bf6a8 (diff) | |
| download | linux-56845d78cee8576a8160cee8aeac62efdb561ae2.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/atheros/atlx/atl1.c
drivers/net/ethernet/atheros/atlx/atl1.h
Resolved a conflict between a DMA error bug fix and NAPI
support changes in the atl1 driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/firmware')
0 files changed, 0 insertions, 0 deletions