diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 12:01:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 12:01:22 -0700 |
| commit | 1e17d774db837fe1a536066cbe971114405d2ba1 (patch) | |
| tree | 41f2a21f6676eaace57ed4f4872f57d551e00c42 /drivers/ide/ide-disk.c | |
| parent | d848223808c5d21e1b3cea090047e34722c6254b (diff) | |
| parent | 0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3 (diff) | |
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
Diffstat (limited to 'drivers/ide/ide-disk.c')
0 files changed, 0 insertions, 0 deletions