diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-05-15 17:18:02 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-05-15 17:18:02 +0800 |
| commit | 63745aa72ed16154b82a0c9ed22a88001d6ea0fa (patch) | |
| tree | 153d8f5f80bdcd574632e846138a8751e1ee7b78 /crypto/twofish_common.c | |
| parent | e6e0a68c6cd585773fa1fbbd1ca71272afe15203 (diff) | |
| parent | 9550b8d1dcfeceb4f6def1f0c56db4daee6bb4d7 (diff) | |
| parent | bc40b5e320dfe4a691a6cf09ac5c8005d561eebd (diff) | |
| parent | fa018d3eed0960a5dcc2d93bb59a770ea341bc9e (diff) | |
Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel-soc-dts-thermal' and 'thermal-soc-fixes' of .git into next