Merge branch 'for_upstream' of git://git.qlogic.com/linux-firmware