Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...

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

Fri, 31 Aug 2012 20:03:33 +0000 (16:03 -0400)

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

Fri, 31 Aug 2012 20:03:33 +0000 (16:03 -0400)
author David S. Miller <davem@davemloft.net>
Fri, 31 Aug 2012 20:03:33 +0000 (16:03 -0400)
committer David S. Miller <davem@davemloft.net>
Fri, 31 Aug 2012 20:03:33 +0000 (16:03 -0400)
diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Fri, 31 Aug 2012 20:03:33 +0000 (16:03 -0400)
committer	David S. Miller <davem@davemloft.net>
	Fri, 31 Aug 2012 20:03:33 +0000 (16:03 -0400)