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>
This commit is contained in:
H. Peter Anvin 2017-03-07 19:32:46 -08:00
commit e28d5ea5d7

Diff Content Not Available