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

Browse source

...

This commit is contained in:

David S. Miller 2012-06-15 15:37:05 -07:00

parent 81aded2467 1d1a79b5b9

commit 91c8028c95

8 changed files with 180 additions and 79 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

11

drivers/net/ethernet/intel/e1000e/netdev.c

View file

43

drivers/net/ethernet/intel/e1000e/param.c

View file

4

drivers/net/ethernet/intel/ixgbe/Makefile

View file

2

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

View file

11

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

View file

149

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

View file

2

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

View file

37

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

View file