linux-next: firmware/driver-core merge conflict

Hi David, Greg,

Today's linux-next merge of the firmware tree got a trivial context
conflict in drivers/usb/misc/isight_firmware.c between commit
b5393ebb32c158ca8c14141d73562b19ee1b7f35 ("isight_firmware: Avoid crash
on loading invalid firmware") from the driver-core tree and commit
eb5767b79bbaa381b67918f1f5405233a74f849b ("isight: treat firmware data as
const") from the firmware tree (which is actually in both trees).

I did the obvious fixup.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/