Merge branches 'nes', 'cxgb4' and 'iwpm' into k.o/for-4.6