MFC e1000 driver revisions: 248906,248908,249074,249339,249509
                            250108,250109,250168,250413,250414
Fix minor mis-merge in contrib/llvm/tools/clang/lib/Basic/Targets.cpp,
reducing the diff against the file in head.
MFC r252587:

Pull in r185446 from clang trunk:

 Fix to PR15826 - clang hits assert in clang::ASTContext::getASTRecordLayout.

Reported by:	glebius
MFC r252852:

Update hpt27xx(4) driver to address a problem reported by FreeNAS
user, where when more than one hpt27xx adapters are being used,
the "unit number" stays at 0.

Many thanks to HighPoint for providing this driver update.

(This changeset have not included change found in 249468)