Merge remote-tracking branch 'upstream/master'
authorRex Xu <rex.xu@amd.com>
Wed, 16 Sep 2015 03:44:50 +0000 (11:44 +0800)
committerRex Xu <rex.xu@amd.com>
Wed, 16 Sep 2015 03:44:50 +0000 (11:44 +0800)
commitfa2d01844eafb0c3d810ce38edd967c1c9ed0024
tree33326a7da4ece85ab0c67061d21e0b64a97af825
parent88fa964745bd8b406a683fb3f5110e04347ea354
parent2398b3a458c98fe3be9e8a276837dd19f0907968
Merge remote-tracking branch 'upstream/master'