Merge branch 'master' of https://github.com/tianocore/edk2 into MemoryAttributeTable
authorjiewen yao <jiewen.yao@intel.com>
Wed, 17 Feb 2016 01:05:35 +0000 (09:05 +0800)
committerjiewen yao <jiewen.yao@intel.com>
Wed, 17 Feb 2016 01:05:35 +0000 (09:05 +0800)

Trivial merge