Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f609845 authored Jan 19, 2013 by David S. Miller

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



Jeff Kirsher says:

====================
This series contains updates to ixgbe, ixgbevf and igb.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 41d06b13 4b9ea462

drivers/net/ethernet/intel/igb/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	################################################################################		################################################################################
	#		#
	# Intel 82575 PCI-Express Ethernet Linux driver		# Intel 82575 PCI-Express Ethernet Linux driver
	# Copyright(c) 1999 - 2012 Intel Corporation.		# Copyright(c) 1999 - 2013 Intel Corporation.
	#		#
	# This program is free software; you can redistribute it and/or modify it		# This program is free software; you can redistribute it and/or modify it
	# under the terms and conditions of the GNU General Public License,		# under the terms and conditions of the GNU General Public License,

drivers/net/ethernet/intel/igb/e1000_82575.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	/*******************************************************************************		/*******************************************************************************

	Intel(R) Gigabit Ethernet Linux driver		Intel(R) Gigabit Ethernet Linux driver
	Copyright(c) 2007-2012 Intel Corporation.		Copyright(c) 2007-2013 Intel Corporation.

	This program is free software; you can redistribute it and/or modify it		This program is free software; you can redistribute it and/or modify it
	under the terms and conditions of the GNU General Public License,		under the terms and conditions of the GNU General Public License,

drivers/net/ethernet/intel/igb/e1000_82575.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	/*******************************************************************************		/*******************************************************************************

	Intel(R) Gigabit Ethernet Linux driver		Intel(R) Gigabit Ethernet Linux driver
	Copyright(c) 2007-2012 Intel Corporation.		Copyright(c) 2007-2013 Intel Corporation.

	This program is free software; you can redistribute it and/or modify it		This program is free software; you can redistribute it and/or modify it
	under the terms and conditions of the GNU General Public License,		under the terms and conditions of the GNU General Public License,

drivers/net/ethernet/intel/igb/e1000_defines.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	/*******************************************************************************		/*******************************************************************************

	Intel(R) Gigabit Ethernet Linux driver		Intel(R) Gigabit Ethernet Linux driver
	Copyright(c) 2007-2012 Intel Corporation.		Copyright(c) 2007-2013 Intel Corporation.

	This program is free software; you can redistribute it and/or modify it		This program is free software; you can redistribute it and/or modify it
	under the terms and conditions of the GNU General Public License,		under the terms and conditions of the GNU General Public License,

drivers/net/ethernet/intel/igb/e1000_hw.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	/*******************************************************************************		/*******************************************************************************

	Intel(R) Gigabit Ethernet Linux driver		Intel(R) Gigabit Ethernet Linux driver
	Copyright(c) 2007-2012 Intel Corporation.		Copyright(c) 2007-2013 Intel Corporation.

	This program is free software; you can redistribute it and/or modify it		This program is free software; you can redistribute it and/or modify it
	under the terms and conditions of the GNU General Public License,		under the terms and conditions of the GNU General Public License,