mesa: Add "OR COPYRIGHT HOLDERS" to license text disclaiming liability.

[mesa.git] / src / mesa / x86 / common_x86_asm.S

diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S
index a681ff9b9ebfafcc0a93217867c2fb67da08570a..8a1d9b4bfb9c9e00b859b76c63f46de48966d5b7 100644 (file)
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@ -17,7 +17,7 @@
  * 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
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
  */
@@ -39,10 +39,7 @@
  * in there will break the build on some platforms.
  */
 
-<<<<<<< HEAD:src/mesa/x86/common_x86_asm.S
-=======
 #include "matypes.h"
->>>>>>> master:src/mesa/x86/common_x86_asm.S
 #include "assyntax.h"
 #include "common_x86_features.h"