[kernel/rawhide/user/myoung/xendom0: 19/20] Merge branch 'master' into rawhide/user/myoung/xendom0

[myoung]

commit b65e52f0405f39861608ebcfe69024ccf6af6197
Merge: 823c8f1 09c361f
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Tue Mar 15 19:06:47 2011 +0000

    Merge branch 'master' into rawhide/user/myoung/xendom0
    
    Conflicts:
    	kernel.spec

 drm-i915-gen4-has-non-power-of-two-strides.patch   |   69 +++
 drm-intel-big-hammer.patch                         |   21 -
 drm-nouveau-updates.patch                          |  586 +++++++++++++++++++-
 kernel.spec                                        |   91 +++-
 linux-2.6-acpi-fix-implicit-notify.patch           |  129 -----
 ...trace-revert-make-ptrace-functions-static.patch |   47 ++
 scripts/rebase.sh                                  |   72 +--
 sources                                            |    4 +-
 sparc64_fix_build_errors_with_gcc460.patch         |  305 ++++++++++
 9 files changed, 1093 insertions(+), 231 deletions(-)
---
diff --cc kernel.spec
index 9d227bb,a875f60..64f30a0
--- a/kernel.spec
+++ b/kernel.spec
@@@ -1971,9 -1970,55 +1993,58 @@@ f
  # and build.
  
  %changelog
+ * Tue Mar 15 2011 Adam Jackson <ajax at redhat.com>
+ - drm-intel-big-hammer.patch: Drop.
+ 
+ * Tue Mar 15 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-1
+ - Linux 2.6.38
+ 
+ * Mon Mar 14 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-0.rc8.git4.1
+ - Linux 2.6.38-rc8-git4
+ 
+ * Thu Mar 10 2011 Chuck Ebbert <cebbert at redhat.com>
+ - Linux 2.6.38-rc8-git3
+ 
+ * Thu Mar 10 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-0.rc8.git2.1
+ - Linux 2.6.38-rc8-git2
+ 
+ * Wed Mar 09 2011 Chuck Ebbert <cebbert at redhat.com>
+ - Linux 2.6.38-rc8-git1
+ 
+ * Wed Mar 09 2011 Dennis Gilmore <dennis at ausil.us>
+ - apply sparc64 gcc-4.6.0 buildfix patch
+ 
+ * Wed Mar 09 2011 Ben Skeggs <bskeggs at redhat.com> 2.6.38-0.rc8.git0.2
+ - nouveau: allow max clients on nv4x (679629), better error reporting
+ 
+ * Tue Mar 08 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-0.rc8.git0.1
+ - Linux 2.6.38-rc8
+ 
+ * Sat Mar 05 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-0.rc7.git4.1
+ - Linux 2.6.38-rc7-git4
+ - Revert upstream commit e3e89cc535223433a619d0969db3fa05cdd946b8
+   for now to fix utrace build.
+ 
+ * Fri Mar 04 2011 Roland McGrath <roland at redhat.com> - 2.6.38-0.rc7.git2.3
+ - Split out perf-debuginfo subpackage.
+ 
+ * Fri Mar 04 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc7.git2.2
+ - Disable drm-i915-gen4-has-non-power-of-two-strides.patch for now, breaks
+   my mutter.
+ 
+ * Fri Mar 04 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc7.git2.1
+ - Linux 2.6.38-rc7-git2
+ - drm-i915-gen4-has-non-power-of-two-strides.patch (#681285)
+ 
+ * Thu Mar 03 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-0.rc7.git1.1
+ - Linux 2.6.38-rc7-git1
+ 
+ * Tue Mar 01 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc7.git0.1
+ - Linux 2.6.38-rc7
+ 
 +* Mon Feb 28 2011 Michael Young <m.a.young at durham.ac.uk>
 +- get updated devel/next-2.6.38
 +
  * Fri Feb 25 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-0.rc6.git6.1
  - Linux 2.6.38-rc6-git6
  - Build in virtio_pci driver so virtio_console will be built-in (#677713)