Merge /spare/repo/linux-2.6/

diff --cc drivers/scsi/ahci.c
Simple merge

diff --cc drivers/scsi/ata_piix.c
Simple merge

diff --cc drivers/scsi/libata-core.c
Simple merge

diff --cc drivers/scsi/libata-scsi.c
Simple merge

diff --cc drivers/scsi/libata.h
Simple merge

diff --cc drivers/scsi/sata_nv.c
index a61c1509aebbfb9a21034c0538f39f3d9d1f35e1,41a3421b02b4c1958754dede8ed9955c5c67b143..03d9bc6e69dfafddda8dc2f39b10953ad00fc6af
--- 1/drivers/scsi/sata_nv.c
--- 2/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@@ -4,32 -4,28 +4,38 @@@
   *  Copyright 2004 NVIDIA Corp.  All rights reserved.
   *  Copyright 2004 Andrew Chew
   *
 - *  The contents of this file are subject to the Open
 - *  Software License version 1.1 that can be found at
 - *  http://www.opensource.org/licenses/osl-1.1.txt and is included herein
 - *  by reference.
 - *
 - *  Alternatively, the contents of this file may be used under the terms
 - *  of the GNU General Public License version 2 (the "GPL") as distributed
 - *  in the kernel source COPYING file, in which case the provisions of
 - *  the GPL are applicable instead of the above.  If you wish to allow
 - *  the use of your version of this file only under the terms of the
 - *  GPL and not to allow others to use your version of this file under
 - *  the OSL, indicate your decision by deleting the provisions above and
 - *  replace them with the notice and other provisions required by the GPL.
 - *  If you do not delete the provisions above, a recipient may use your
 - *  version of this file under either the OSL or the GPL.
 + *
 + *  This program is free software; you can redistribute it and/or modify
 + *  it under the terms of the GNU General Public License as published by
 + *  the Free Software Foundation; either version 2, or (at your option)
 + *  any later version.
 + *
 + *  This program is distributed in the hope that it will be useful,
 + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + *  GNU General Public License for more details.
 + *
 + *  You should have received a copy of the GNU General Public License
 + *  along with this program; see the file COPYING.  If not, write to
 + *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 + *
 + *
 + *  libata documentation is available via 'make {ps|pdf}docs',
 + *  as Documentation/DocBook/libata.*
 + *
 + *  No hardware documentation available outside of NVIDIA.
 + *  This driver programs the NVIDIA SATA controller in a similar
 + *  fashion as with other PCI IDE BMDMA controllers, with a few
 + *  NV-specific details such as register offsets, SATA phy location,
 + *  hotplug info, etc.
 + *
   *
+  *  0.08
+  *     - Added support for MCP51 and MCP55.
+  *
+  *  0.07
+  *     - Added support for RAID class code.
+  *
   *  0.06
   *     - Added generic SATA support by using a pci_device_id that filters on
   *       the IDE storage class code.

diff --cc drivers/scsi/sata_promise.c
Simple merge

diff --cc drivers/scsi/sata_qstor.c
Simple merge

diff --cc drivers/scsi/sata_sil.c
index 345e6f2d28a89058183132ec31bd244914710206,9d24d6c328b4787c8e54901152ac73f721554737..71d49548f0a36223cfb1aaa060cd77be52e9a9f5
--- 1/drivers/scsi/sata_sil.c
--- 2/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@@ -5,28 -5,30 +5,33 @@@
   *                Please ALWAYS copy linux-ide@vger.kernel.org
   *                on emails.
   *
 - *  Copyright 2003 Red Hat, Inc.
 + *  Copyright 2003-2005 Red Hat, Inc.
   *  Copyright 2003 Benjamin Herrenschmidt
   *
 - *  The contents of this file are subject to the Open
 - *  Software License version 1.1 that can be found at
 - *  http://www.opensource.org/licenses/osl-1.1.txt and is included herein
 - *  by reference.
   *
 - *  Alternatively, the contents of this file may be used under the terms
 - *  of the GNU General Public License version 2 (the "GPL") as distributed
 - *  in the kernel source COPYING file, in which case the provisions of
 - *  the GPL are applicable instead of the above.  If you wish to allow
 - *  the use of your version of this file only under the terms of the
 - *  GPL and not to allow others to use your version of this file under
 - *  the OSL, indicate your decision by deleting the provisions above and
 - *  replace them with the notice and other provisions required by the GPL.
 - *  If you do not delete the provisions above, a recipient may use your
 - *  version of this file under either the OSL or the GPL.
 + *  This program is free software; you can redistribute it and/or modify
 + *  it under the terms of the GNU General Public License as published by
 + *  the Free Software Foundation; either version 2, or (at your option)
 + *  any later version.
 + *
 + *  This program is distributed in the hope that it will be useful,
 + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + *  GNU General Public License for more details.
 + *
 + *  You should have received a copy of the GNU General Public License
 + *  along with this program; see the file COPYING.  If not, write to
 + *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 + *
 + *
 + *  libata documentation is available via 'make {ps|pdf}docs',
 + *  as Documentation/DocBook/libata.*
   *
+  *  Documentation for SiI 3112:
+  *  http://gkernel.sourceforge.net/specs/sii/3112A_SiI-DS-0095-B2.pdf.bz2
+  *
+  *  Other errata and documentation available under NDA.
+  *
   */
  
  #include <linux/kernel.h>

diff --cc drivers/scsi/sata_sis.c
Simple merge

diff --cc drivers/scsi/sata_svw.c
Simple merge

diff --cc drivers/scsi/sata_sx4.c
Simple merge

diff --cc drivers/scsi/sata_uli.c
Simple merge

diff --cc drivers/scsi/sata_via.c
Simple merge

diff --cc drivers/scsi/sata_vsc.c
Simple merge

diff --cc include/linux/ata.h
Simple merge

diff --cc include/linux/libata.h
Simple merge