linux/firmware
Linus Torvalds 6ba74014c1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)
  phy/marvell: add 88ec048 support
  igb: Program MDICNFG register prior to PHY init
  e1000e: correct MAC-PHY interconnect register offset for 82579
  hso: Add new product ID
  can: Add driver for esd CAN-USB/2 device
  l2tp: fix export of header file for userspace
  can-raw: Fix skb_orphan_try handling
  Revert "net: remove zap_completion_queue"
  net: cleanup inclusion
  phy/marvell: add 88e1121 interface mode support
  u32: negative offset fix
  net: Fix a typo from "dev" to "ndev"
  igb: Use irq_synchronize per vector when using MSI-X
  ixgbevf: fix null pointer dereference due to filter being set for VLAN 0
  e1000e: Fix irq_synchronize in MSI-X case
  e1000e: register pm_qos request on hardware activation
  ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice
  net: Add getsockopt support for TCP thin-streams
  cxgb4: update driver version
  cxgb4: add new PCI IDs
  ...

Manually fix up conflicts in:
 - drivers/net/e1000e/netdev.c: due to pm_qos registration
   infrastructure changes
 - drivers/net/phy/marvell.c: conflict between adding 88ec048 support
   and cleaning up the IDs
 - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req
   conflict (registration change vs marking it static)
2010-08-04 11:47:58 -07:00
..
3com
acenic
adaptec
advansys
av7110
bnx2 bnx2: Update 5709 MIPS firmware and version to 2.0.15. 2010-05-17 17:33:31 -07:00
cis
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
korg
matrox
myricom
ositech
qlogic IB/qib: Use request_firmware() to load SD7220 firmware 2010-07-08 13:27:05 -07:00
r128
radeon
sb16
sun
tehuti
tigon
ttusb-budget
vicam
yam
yamaha
.gitignore
atmsar11.HEX
bnx2x-e1-5.2.13.0.fw.ihex bnx2x: FW 5.2.13 2010-02-17 13:35:43 -08:00
bnx2x-e1h-5.2.13.0.fw.ihex bnx2x: FW 5.2.13 2010-02-17 13:35:43 -08:00
ihex2fw.c
intelliport2.bin.ihex
Makefile Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-08-04 11:47:58 -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 IB/qib: Use request_firmware() to load SD7220 firmware 2010-07-08 13:27:05 -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).