tree 41f2a21f6676eaace57ed4f4872f57d551e00c42
parent d848223808c5d21e1b3cea090047e34722c6254b
parent 0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3
author Linus Torvalds <torvalds@linux-foundation.org> 1239390082 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239390082 -0700

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