tree eec56da5fbc796bac7c67f1990a18f5e0a304059
parent f8a15af093b19b86d56933c8757cee298d0f32a8
parent 6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82
author David S. Miller <davem@davemloft.net> 1321901433 -0500
committer David S. Miller <davem@davemloft.net> 1321901433 -0500

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c