| commit | dd634666793e51b43b703161302310326c259d50 | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Thu Sep 18 14:48:40 2014 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Thu Sep 18 14:48:40 2014 +0800 |
| tree | 2da0cbb2db8176c4d5f7ef160f681ff6ed696aa1 | |
| parent | 62ebb7b16699996a8f8ad277ce6a36ef3c9114a3 [diff] | |
| parent | e4dbf98f7f169346f57296e173e883b7330076ab [diff] |
Merge branches 'eduardo-soc' and 'bang-bang-governor' of .git into next