tree 40a88e6bae4e797cafce33f16a25e350c038f9bb
parent da1943164677ae2cdd630196b79089d476726348
parent b01543dfe67bb1d191998e90d20534dc354de059
author David S. Miller <davem@davemloft.net> 1329685395 -0500
committer David S. Miller <davem@davemloft.net> 1329685395 -0500

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>