Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

* '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.

diff --git a/WHENCE b/WHENCE
index 00378ee..3f8c4f6 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -418,6 +418,23 @@ License: GPLv2 or OpenIB.org BSD license, no source visible
 
 --------------------------------------------------------------------------
 
+Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter
+
+File: cxgb3/ael2005_opt_edc.bin.ihex
+File: cxgb3/ael2005_twx_edc.bin.ihex
+File: cxgb3/ael2020_twx_edc.bin.ihex
+
+Licence:
+ *     Copyright (c) 2007-2009 NetLogic Microsystems, Inc.
+ *
+ *     Permission is hereby granted for the distribution of this firmware
+ *     data in hexadecimal or equivalent format, provided this copyright
+ *     notice is accompanying it.
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
+
 Driver: e100 -- Intel PRO/100 Ethernet NIC
 
 File: e100/d101m_ucode.bin
@@ -579,6 +596,7 @@ Found in hex form in kernel source.
 Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter
 
 File: cis/LA-PCM.cis
+      cis/PCMLM28.cis
 
 Licence: GPL
 
@@ -606,6 +624,17 @@ Originally developed by the pcmcia-cs project
 
 --------------------------------------------------------------------------
 
+Driver: SERIAL_8250_CS - Serial PCMCIA adapter
+
+File: cis/MT5634ZLX.cis
+      cis/RS-COM-2P.cis
+
+Licence: GPL
+
+Originally developed by the pcmcia-cs project
+
+--------------------------------------------------------------------------
+
 Driver: PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA
 
 File: ositech/Xilinx7OD.bin

diff --git a/bnx2/bnx2-mips-06-4.6.16.fw b/bnx2/bnx2-mips-06-4.6.16.fw
deleted file mode 100644 (file)
index 0ff4f5a..0000000
Binary files a/bnx2/bnx2-mips-06-4.6.16.fw and /dev/null differ

diff --git a/bnx2/bnx2-mips-06-5.0.0.j3.fw b/bnx2/bnx2-mips-06-5.0.0.j3.fw
new file mode 100644 (file)
index 0000000..6804b82
Binary files /dev/null and b/bnx2/bnx2-mips-06-5.0.0.j3.fw differ

diff --git a/bnx2/bnx2-mips-09-4.6.17.fw b/bnx2/bnx2-mips-09-4.6.17.fw
deleted file mode 100644 (file)
index 2736b4a..0000000
Binary files a/bnx2/bnx2-mips-09-4.6.17.fw and /dev/null differ

diff --git a/bnx2/bnx2-mips-09-5.0.0.j3.fw b/bnx2/bnx2-mips-09-5.0.0.j3.fw
new file mode 100644 (file)
index 0000000..6c98988
Binary files /dev/null and b/bnx2/bnx2-mips-09-5.0.0.j3.fw differ

diff --git a/bnx2/bnx2-rv2p-06-4.6.16.fw b/bnx2/bnx2-rv2p-06-4.6.16.fw
deleted file mode 100644 (file)
index bea33c3..0000000
Binary files a/bnx2/bnx2-rv2p-06-4.6.16.fw and /dev/null differ

diff --git a/bnx2/bnx2-rv2p-06-5.0.0.j3.fw b/bnx2/bnx2-rv2p-06-5.0.0.j3.fw
new file mode 100644 (file)
index 0000000..1f805a1
Binary files /dev/null and b/bnx2/bnx2-rv2p-06-5.0.0.j3.fw differ

diff --git a/bnx2/bnx2-rv2p-09-4.6.15.fw b/bnx2/bnx2-rv2p-09-4.6.15.fw
deleted file mode 100644 (file)
index bdb5d10..0000000
Binary files a/bnx2/bnx2-rv2p-09-4.6.15.fw and /dev/null differ

diff --git a/bnx2/bnx2-rv2p-09-5.0.0.j3.fw b/bnx2/bnx2-rv2p-09-5.0.0.j3.fw
new file mode 100644 (file)
index 0000000..82a5de2
Binary files /dev/null and b/bnx2/bnx2-rv2p-09-5.0.0.j3.fw differ

diff --git a/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw b/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw
new file mode 100644 (file)
index 0000000..834c479
Binary files /dev/null and b/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw differ

diff --git a/bnx2x-e1-4.8.53.0.fw b/bnx2x-e1-4.8.53.0.fw
deleted file mode 100644 (file)
index 37c0f38..0000000
Binary files a/bnx2x-e1-4.8.53.0.fw and /dev/null differ

diff --git a/bnx2x-e1-5.0.21.0.fw b/bnx2x-e1-5.0.21.0.fw
new file mode 100644 (file)
index 0000000..6f990e9
Binary files /dev/null and b/bnx2x-e1-5.0.21.0.fw differ

diff --git a/bnx2x-e1h-4.8.53.0.fw b/bnx2x-e1h-4.8.53.0.fw
deleted file mode 100644 (file)
index 6fcd9f9..0000000
Binary files a/bnx2x-e1h-4.8.53.0.fw and /dev/null differ

diff --git a/bnx2x-e1h-5.0.21.0.fw b/bnx2x-e1h-5.0.21.0.fw
new file mode 100644 (file)
index 0000000..de70fb8
Binary files /dev/null and b/bnx2x-e1h-5.0.21.0.fw differ

diff --git a/cis/MT5634ZLX.cis b/cis/MT5634ZLX.cis
new file mode 100644 (file)
index 0000000..0d59fa4
Binary files /dev/null and b/cis/MT5634ZLX.cis differ

diff --git a/cis/PCMLM28.cis b/cis/PCMLM28.cis
new file mode 100644 (file)
index 0000000..a35d93e
Binary files /dev/null and b/cis/PCMLM28.cis differ

diff --git a/cis/RS-COM-2P.cis b/cis/RS-COM-2P.cis
new file mode 100644 (file)
index 0000000..f258252
Binary files /dev/null and b/cis/RS-COM-2P.cis differ

diff --git a/cxgb3/ael2005_opt_edc.bin b/cxgb3/ael2005_opt_edc.bin
new file mode 100644 (file)
index 0000000..df2ffd9
Binary files /dev/null and b/cxgb3/ael2005_opt_edc.bin differ

diff --git a/cxgb3/ael2005_twx_edc.bin b/cxgb3/ael2005_twx_edc.bin
new file mode 100644 (file)
index 0000000..d3e91fa
Binary files /dev/null and b/cxgb3/ael2005_twx_edc.bin differ

diff --git a/cxgb3/ael2020_twx_edc.bin b/cxgb3/ael2020_twx_edc.bin
new file mode 100644 (file)
index 0000000..4ecf70a
Binary files /dev/null and b/cxgb3/ael2020_twx_edc.bin differ