kevin/linux
1
Fork 0
Code
4d03b446d2
linux/drivers/net/e1000e
History
Linus Torvalds 5e152b4c9e Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)
  PCI: Don't use dmi_name_in_vendors in quirk
  PCI: remove unused AER functions
  PCI/sysfs: move bus cpuaffinity to class dev_attrs
  PCI: add rescan to /sys/.../pci_bus/.../
  PCI: update bridge resources to get more big ranges when allocating space (again)
  KVM: Use pci_store/load_saved_state() around VM device usage
  PCI: Add interfaces to store and load the device saved state
  PCI: Track the size of each saved capability data area
  PCI/e1000e: Add and use pci_disable_link_state_locked()
  x86/PCI: derive pcibios_last_bus from ACPI MCFG
  PCI: add latency tolerance reporting enable/disable support
  PCI: add OBFF enable/disable support
  PCI: add ID-based ordering enable/disable support
  PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.
  PCI: Set PCIE maxpayload for card during hotplug insertion
  PCI/ACPI: Report _OSC control mask returned on failure to get control
  x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs
  PCI: handle positive error codes
  PCI: check pci_vpd_pci22_wait() return
  PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio
  ...

Fix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be44
moved the intel SMBUS ID definitons to the i2c-i801.c driver.
2011-05-23 15:39:34 -07:00
..
82571.c e1000e: implement ethtool set_phys_id 2011-04-27 02:05:53 -07:00
defines.h e1000e: disable jumbo frames on 82579 when MACsec enabled in EEPROM 2011-03-11 02:23:21 -08:00
e1000.h e1000e: implement ethtool set_phys_id 2011-04-27 02:05:53 -07:00
es2lan.c e1000e: implement ethtool set_phys_id 2011-04-27 02:05:53 -07:00
ethtool.c net/igb/e1000/e1000e: more robust ethtool duplex/speed configuration 2011-04-29 14:03:03 -07:00
hw.h e1000e: implement ethtool set_phys_id 2011-04-27 02:05:53 -07:00
ich8lan.c e1000e: implement ethtool set_phys_id 2011-04-27 02:05:53 -07:00
lib.c e1000e: minor comment cleanups 2011-05-14 17:50:01 -07:00
Makefile e1000e: update Copyright for 2011 2011-01-14 02:04:01 -08:00
netdev.c Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-05-23 15:39:34 -07:00
param.c e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs 2011-01-14 02:06:23 -08:00
phy.c e1000e: convert short duration msleep() to usleep_range() 2011-04-13 19:17:06 -07:00