Merge branches 'ehca' and 'ipoib' into for-linus