Merge branches 'ehca', 'misc', 'mlx4', 'mthca' and 'nes' into for-linus