Rollback the change 15178. 
And, update NameString IScsiDxeStrings[] to IScsi4DxeStrings[] to match its BASE_NAME

Signed-off-by: Gao, Liming <liming.gao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15186 6f19259b-4bc3-4df7-8a09-765794883524
Fix the typo for the structure definition of EFI_ADAPTER_INFO_NETWORK_BOOT in AdapterInformation.

Signed-off-by: Shumin Qiu <shumin.qiu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15187 6f19259b-4bc3-4df7-8a09-765794883524
Sync BaseTool trunk (version r2649) into EDKII BaseTools.

Signed-off-by: Gao, Liming <liming.gao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15188 6f19259b-4bc3-4df7-8a09-765794883524
Fix CRLF format

Signed-off-by: Tian, Hot <hot.tian@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15189 6f19259b-4bc3-4df7-8a09-765794883524
Merge branch 'master' of https://github.com/tianocore/edk2

Conflicts:
	BaseTools/Source/C/GNUmakefile
EOL troubles