Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

author David S. Miller <davem@davemloft.net>

Tue, 11 Oct 2011 19:24:56 +0000 (15:24 -0400)

committer David S. Miller <davem@davemloft.net>

Tue, 11 Oct 2011 19:24:56 +0000 (15:24 -0400)
author David S. Miller <davem@davemloft.net>
Tue, 11 Oct 2011 19:24:56 +0000 (15:24 -0400)
committer David S. Miller <davem@davemloft.net>
Tue, 11 Oct 2011 19:24:56 +0000 (15:24 -0400)
diff --cc drivers/net/ethernet/intel/igb/igb_ethtool.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Tue, 11 Oct 2011 19:24:56 +0000 (15:24 -0400)
committer	David S. Miller <davem@davemloft.net>
	Tue, 11 Oct 2011 19:24:56 +0000 (15:24 -0400)