2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 14:43:58 +08:00
linux-next/drivers/net/igb
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
e1000_82575.c igb: Add support for DH89xxCC 2010-09-22 21:20:04 -07:00
e1000_82575.h igb: add per-packet timestamping 2010-03-30 23:42:27 -07:00
e1000_defines.h igb: Add support for DH89xxCC 2010-09-22 21:20:04 -07:00
e1000_hw.h igb: Add support for DH89xxCC 2010-09-22 21:20:04 -07:00
e1000_mac.c igb: add support for reporting 5GT/s during probe on PCIe Gen2 2010-04-27 12:53:28 -07:00
e1000_mac.h igb: remove adaptive IFS from driver 2010-02-17 13:21:34 -08:00
e1000_mbx.c igb: fix a few items where weren't correctly setup for mbx timeout 2009-10-06 14:59:21 -07:00
e1000_mbx.h igb: rework use of VMOLR in regards to PF and VFs 2009-10-28 03:25:40 -07:00
e1000_nvm.c igb: remove microwire support from igb 2009-10-06 14:59:22 -07:00
e1000_nvm.h
e1000_phy.c igb: Add support for DH89xxCC 2010-09-22 21:20:04 -07:00
e1000_phy.h igb: Add support for DH89xxCC 2010-09-22 21:20:04 -07:00
e1000_regs.h igb: support for VF configuration tools 2010-02-12 16:56:09 -08:00
igb_ethtool.c igb: fix stats handling 2010-10-18 07:54:29 -07:00
igb_main.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
igb.h igb: fix stats handling 2010-10-18 07:54:29 -07:00
Makefile igb: Add support for enabling VFs to PF driver. 2009-02-20 00:22:54 -08:00