This was needed to avoid conflicts in the minstrel changes.
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>