diff options
author | David S. Miller <davem@davemloft.net> | 2012-02-20 01:03:15 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-20 01:03:15 +0400 |
commit | 32efe08d77f5902ce7315fc9003c010ffffb8268 (patch) | |
tree | 40a88e6bae4e797cafce33f16a25e350c038f9bb /drivers/net/wireless/wl12xx/acx.c | |
parent | da1943164677ae2cdd630196b79089d476726348 (diff) | |
parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
download | linux-32efe08d77f5902ce7315fc9003c010ffffb8268.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
Small minor conflict in bnx2x, wherein one commit changed how
statistics were stored in software, and another commit
fixed endianness bugs wrt. reading the values provided by
the chip in memory.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/wl12xx/acx.c')
0 files changed, 0 insertions, 0 deletions