2 Commits

Author	SHA1	Message	Date
David S. Miller	bb7e95c8fd	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/bnx2x_main.c Merge bnx2x bug fixes in by hand... :-/ Signed-off-by: David S. Miller <davem@davemloft.net>	2010-07-27 21:01:35 -07:00
Dmitry Kravkov	6c719d00bd	bnx2x: Move statistics handling code to bnx2x_stats.* ... Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>	2010-07-27 20:35:42 -07:00