• L
    Merge git://git.infradead.org/~dwmw2/firmware-2.6 · 1e17d774
    Linus Torvalds 提交于
    * git://git.infradead.org/~dwmw2/firmware-2.6:
      qla1280: Fix off-by-some error in firmware loading.
      Add README.AddingFirmware file. Basically telling people not to.
      firmware: Remove newly-added slicoss and sxg firmware images
      firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw
      ALSA: wavefront - Always use request_firmware()
      Remove fdump tool for av7110 firmware
      firmware: convert av7110 driver to request_firmware()
      Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card"
      Revert "fix modules_install via NFS"
    
    Add-add conflicts in firmware/WHENCE fixed manually
    1e17d774
Makefile 10.1 KB