Conflicts: drivers/net/usb/asix.c drivers/net/wireless/iwlwifi/iwl-agn-rs.c drivers/usb/serial/option.c