| commit | e28d5ea5d77c0f267b97fc54d0f40bf59fd5a202 | |
| author | H. Peter Anvin <hpa@linux.intel.com> | |
| Wed, 8 Mar 2017 03:32:46 +0000 (7 19:32 -0800) | ||
| committer | H. Peter Anvin <hpa@linux.intel.com> | |
| Wed, 8 Mar 2017 03:32:46 +0000 (7 19:32 -0800) | ||
| tree | 18f2112c446ae63e33c3e919da87006c64dc8cdc | treesnapshot (tar.gz zip) |
| parent | b20bc733c93f9f4fd3ba44dd6af36dc3b578d041 | commitdiff |
| parent | 17cb4eb65955baf070a065e7858196b4963b3f63 | commitdiff |
Merge remote-tracking branch 'origin/master'
The directiv.c renaming unfortunately got pushed in two separate
version; force the correct one.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
The directiv.c renaming unfortunately got pushed in two separate
version; force the correct one.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>