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

Browse source

Jerr Kirsher says:

> This series contains updates to igb (specifically PTP code).

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

...

This commit is contained in:

David S. Miller 2012-09-17 00:49:02 -04:00

parent b48b63a1f6 4ffdf91a5f

commit e97563989a

6 changed files with 423 additions and 64 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

drivers/net/ethernet/intel/e1000/e1000_main.c

View file

2

drivers/net/ethernet/intel/ixgbe/Makefile

View file

10

drivers/net/ethernet/intel/ixgbe/ixgbe.h

View file

300

drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c

View file

60

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

View file

103

drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c

View file