linux/firmware
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
3com
acenic
adaptec
advansys
av7110
bnx2 bnx2: Update firmware to 6.0.x. 2010-10-11 16:12:00 -07:00
bnx2x bnx2x: remove old FW files 2010-10-06 14:10:35 -07:00
cis pcnet_cs: add cis of KTI PE520 pcmcia network card 2010-01-06 20:37:58 -08:00
cpia2
cxgb3 cxgb3: update FW to 7.10 2010-06-25 21:33:13 -07:00
dabusb
dsp56k
e100
edgeport
emi26
emi62
ess
kaweth
keyspan
keyspan_pda Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
korg
matrox
myricom
ositech
qlogic IB/qib: Use request_firmware() to load SD7220 firmware 2010-07-08 13:27:05 -07:00
r128
radeon radeon: Use request_firmware() 2009-08-31 09:09:30 +10:00
sb16
sun
tehuti
tigon
ttusb-budget
vicam
yam
yamaha
.gitignore
atmsar11.HEX
ihex2fw.c Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS 2009-09-23 07:39:28 -07:00
intelliport2.bin.ihex
Makefile bnx2: Update firmware to 6.0.x. 2010-10-11 16:12:00 -07:00
mts_cdma.fw.ihex
mts_edge.fw.ihex
mts_gsm.fw.ihex
README.AddingFirmware
ti_3410.fw.ihex
ti_5052.fw.ihex
tr_smctr.bin.ihex
WHENCE bnx2: Update firmware to 6.0.x. 2010-10-11 16:12:00 -07:00
whiteheat_loader_debug.HEX
whiteheat_loader.HEX
whiteheat.HEX

	DO NOT ADD FIRMWARE TO THIS DIRECTORY.
	======================================

This directory is only here to contain firmware images extracted from old
device drivers which predate the common use of request_firmware().

As we update those drivers to use request_firmware() and keep a clean
separation between code and firmware, we put the extracted firmware
here.

This directory is _NOT_ for adding arbitrary new firmware images. The
place to add those is the separate linux-firmware repository:

    git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git

That repository contains all these firmware images which have been
extracted from older drivers, as well various new firmware images which
we were never permitted to include in a GPL'd work, but which we _have_
been permitted to redistribute under separate cover.

To submit firmware to that repository, please send either a git binary
diff or preferably a git pull request to:
      David Woodhouse <dwmw2@infradead.org>

Your commit should include an update to the WHENCE file clearly
identifying the licence under which the firmware is available, and
that it is redistributable. If the licence is long and involved, it's
permitted to include it in a separate file and refer to it from the
WHENCE file.

Ideally, your commit should contain a Signed-Off-By: from someone
authoritative on the licensing of the firmware in question (i.e. from
within the company that owns the code).