From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Apr 2009 19:01:22 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/firmware-2.6
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeb537e9d7ed7cc9c04b9e48d0e16c667527b0ca;hp=aeb537e9d7ed7cc9c04b9e48d0e16c667527b0ca;p=linux-firmware

Merge git://git.infradead.org/~dwmw2/firmware-2.6

* 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
---