GitLab

Signed-off-by: Hicham HAOUARI <hicham.haouari@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Version is 9.201.4.1
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

This shouldn't have been in .ihex form
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

The following patch contains firmware for Multitech Systems' MT9234MU
and MT9234ZBA usb dialup fax modems. It has been provided to me by
Multitech Systems' support, and I converted the files to ihex format with
objcopy -I binary -O ihex <file.fw> <file.fw>.ihex
Signed-off-by: Alex Manoussakis <alex@juniper.net>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Conflicts:
	WHENCE

Signed-off-by: Vikram Kandukuri <vikram.kandukuri@atheros.com>
Signed-off-by: Jothi Kumar <jkumar@atheros.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

This is for the radeon HD5000 family of cards.

also update year in license file.
Signed-off-by: Dave Airlie <airlied@redhat.com>

Conflicts:
	WHENCE

Conflicts:
	WHENCE

Conflicts:
	WHENCE

These files have nothing to do with the pcmcia-cs project; they are
distributed by Sierra Wireless under GPLv3.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Chipset supported: AR9271
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Firmware for Intel 6000 Series Wi-Fi Adapters is version 9.193.4.1

Changelog:
- Sync with fixes from factory
- Fix CTKILL issue after resume
- Fix TC error resulting in NMI On 8KiB AMSDU frames required at
  least 4KiB free space
- Fix for 6000 series cards with EEPROM
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

License is redistributable but no RE or modification.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Sensoray sent me those two additional firmwares, under the same licence.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

This is taken from the lgs8gxx driver as of 2.6.32-rc5.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Drivers are currently specified by a mixture of module name, config
option or description, which is not that useful.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

This will aid automatic parsing of this file.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Filenames should be the names of the installed binary files, without
the base directory 'firmware'.

Remove mention of absent file 'whiteheat_loader_debug.fw'.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Not entirely sure how these went wrong; will keep a closer eye on the
auto-conversion script. Thanks to Erik Inge Bolsø for spotting it.

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/linux-firmware-from-kernel

Conflicts:
	WHENCE

Signed-off-by: Tom Pham <tpham@atheros.com>
Signed-off-by: Vikram Kandukuri <vikram.kandukuri@atheros.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

This comes directly from RealTek in their driver package provided
on their web site to be downloaded.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Conflicts:
	drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.
Signed-off-by: David S. Miller <davem@davemloft.net>

Conflicts:
	drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.
Signed-off-by: David S. Miller <davem@davemloft.net>

pcnet_cs,serial_cs:

add cis of PreMax ethernet pcmcia card,
and some Sierra Wireless serial card(AC555, AC7xx, AC8xx).

use PROD_ID for AC7xx, because MANF_ID of AC7xx and AC8xx are the same.
Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

pcnet_cs,serial_cs:

add cis of PreMax ethernet pcmcia card,
and some Sierra Wireless serial card(AC555, AC7xx, AC8xx).

use PROD_ID for AC7xx, because MANF_ID of AC7xx and AC8xx are the same.
Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

Value of zero was used to disable the fairness mechanism. Though the code
(driver and FW) allowed changing the value at run time, it did not allow to do
that if the mechanism was disabled to begin with.
Fixed the FW to allow turning on and off the mechanism at run time. Fixed the
code to read the value from the chip at the right sequence.
Without this fix, if the initial value was set to zero, traffic could not run on
the interface.
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Value of zero was used to disable the fairness mechanism. Though the code
(driver and FW) allowed changing the value at run time, it did not allow to do
that if the mechanism was disabled to begin with.
Fixed the FW to allow turning on and off the mechanism at run time. Fixed the
code to read the value from the chip at the right sequence.
Without this fix, if the initial value was set to zero, traffic could not run on
the interface.
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Thanks to Patrick Boettcher <pboettcher@dibcom.fr> from DiBcom for
providing the firmware under a redistributable license.
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

pcnet_cs,serial_cs:
  
add cis of National Semicondoctor's lan&modem mulitifunction pcmcia card,
NE2K, tamarack ethernet card,
and some serial card(COMpad2, COMpad4).
Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

pcnet_cs,serial_cs:
  
add cis of National Semicondoctor's lan&modem mulitifunction pcmcia card,
NE2K, tamarack ethernet card,
and some serial card(COMpad2, COMpad4).
Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (133 commits)
  drm/vgaarb: add VGA arbitration support to the drm and kms.
  drm/radeon: some r420s have a CP race with the DMA engine.
  drm/radeon/r600/kms: rv670 is not DCE3
  drm/radeon/kms: r420 idle after programming GA_ENHANCE
  drm/radeon/kms: more fixes to rv770 suspend/resume path.
  drm/radeon/kms: more alignment for rv770.c with r600.c
  drm/radeon/kms: rv770 blit init called too late.
  drm/radeon/kms: move around new init path code to avoid posting at init
  drm/radeon/r600: fix some issues with suspend/resume.
  drm/radeon/kms: disable VGA rendering engine before taking over VRAM
  drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init().
  drm/radeon/kms: add initial connector properties
  drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.
  drm/radeon/kms: don't fail if we fail to init GPU acceleration
  drm/r600/kms: fixup number of loops per blit calculation.
  drm/radeon/kms: reprogram format in set base.
  drm/radeon: avivo chips have no separate int bit for display
  drm/radeon/r600: don't do interrupts
  drm: fix _DRM_GEM addmap error message
  drm: update crtc x/y when only fb changes
  ...

Fixed up trivial conflicts in firmware/Makefile due to network driver
(cxgb3) and drm (mga/r128/radeon) firmware being listed next to each
other.