Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7