merge igb driver related changes

No match.