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 --combined WHENCE
index 82db5256a4e5b24a9f76e6f27bacecdc07245708,00378ee2b75b727e104f9db90145c5aedad378d1..3f8c4f6bc43fbe8a48e23e7c2f4e5407ea50a036
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -418,23 -418,6 +418,23 @@@ License: GPLv2 or OpenIB.org BSD licens
  
  --------------------------------------------------------------------------
  
 +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
@@@ -596,7 -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
  
@@@ -624,17 -606,6 +624,17 @@@ Originally developed by the pcmcia-cs p
  
  --------------------------------------------------------------------------
  
 +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
@@@ -727,3 -698,124 +727,124 @@@ Found in hex form in kernel source, wit
     Copyright (c) 1998-2002 by Paul Davis <pbd@op.net>
  
  --------------------------------------------------------------------------
+ 
+ Driver: mga - Matrox G200/G400/G550
+ 
+ File: matrox/g200_warp.fw
+ File: matrox/g400_warp.fw
+ 
+ Licence:
+ 
+ Copyright 1999 Matrox Graphics Inc.
+ All Rights Reserved.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ MATROX GRAPHICS INC., OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: r128 - ATI Rage 128
+ 
+ File: r128/r128_cce.bin
+ 
+ Licence:
+ 
+ Copyright 2000 Advanced Micro Devices, Inc.
+ 
+  * Permission is hereby granted, free of charge, to any person obtaining a
+  * copy of this software and associated documentation files (the "Software"),
+  * to deal in the Software without restriction, including without limitation
+  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  * and/or sell copies of the Software, and to permit persons to whom the
+  * Software is furnished to do so, subject to the following conditions:
+  *
+  * The above copyright notice and this permission notice (including the next
+  * paragraph) shall be included in all copies or substantial portions of the
+  * Software.
+  *
+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+  * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  * DEALINGS IN THE SOFTWARE.
+ 
+ Found in decimal form in kernel source.
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: radeon - ATI Radeon
+ 
+ File: radeon/R100_cp.bin
+ File: radeon/R200_cp.bin
+ File: radeon/R300_cp.bin
+ File: radeon/R420_cp.bin
+ File: radeon/RS600_cp.bin
+ File: radeon/RS690_cp.bin
+ File: radeon/R520_cp.bin
+ File: radeon/R600_pfp.bin
+ File: radeon/R600_me.bin
+ File: radeon/RV610_pfp.bin
+ File: radeon/RV610_me.bin
+ File: radeon/RV630_pfp.bin
+ File: radeon/RV630_me.bin
+ File: radeon/RV620_pfp.bin
+ File: radeon/RV620_me.bin
+ File: radeon/RV635_pfp.bin
+ File: radeon/RV635_me.bin
+ File: radeon/RV670_pfp.bin
+ File: radeon/RV670_me.bin
+ File: radeon/RS780_pfp.bin
+ File: radeon/RS780_me.bin
+ File: radeon/RV770_pfp.bin
+ File: radeon/RV770_me.bin
+ File: radeon/RV730_pfp.bin
+ File: radeon/RV730_me.bin
+ File: radeon/RV710_pfp.bin
+ File: radeon/RV710_me.bin
+ 
+ Licence:
+ 
+  * Copyright 2007-2009 Advanced Micro Devices, Inc.
+  * All Rights Reserved.
+  *
+  * Permission is hereby granted, free of charge, to any person obtaining a
+  * copy of this software and associated documentation files (the "Software"),
+  * to deal in the Software without restriction, including without limitation
+  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  * and/or sell copies of the Software, and to permit persons to whom the
+  * Software is furnished to do so, subject to the following conditions:
+  *
+  * The above copyright notice and this permission notice (including the next
+  * paragraph) shall be included in all copies or substantial portions of the
+  * Software.
+  *
+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+  * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+  * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------