Linux 3.4.84

Conflicts:
	drivers/net/ethernet/broadcom/tg3.h