[kernel/rawhide/user/myoung/xendom0: 4/5] Merge branch 'master' into rawhide/user/myoung/xendom0

[myoung]

commit 28fc538cef7a2b1f8c4e6c40d6cac41d7b9c3f4f
Merge: 3e91389 e2a5d65
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Sun Jan 9 20:15:36 2011 +0000

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

 ...it-not-__exit-in-n2_unregister_algs-fixes.patch |   26 +++++++++++++++
 ...-eDP-encoder-correctly-when-setting-modes.patch |   33 ++++++++++++++++++++
 kernel.spec                                        |   24 ++++++++++++--
 3 files changed, 80 insertions(+), 3 deletions(-)
---
diff --cc kernel.spec
index 1357e9d,510a596..32faf28
--- a/kernel.spec
+++ b/kernel.spec
@@@ -1968,10 -1959,16 +1976,20 @@@ f
  #                 ||     ||
  
  %changelog
+ * Fri Jan 07 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.37-2
+ - drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch reported to
+   fix HP/Sony eDP issues by adamw and airlied.
+ 
 +* Wed Jan 05 2011 Michael Young <m.a.young at durham.ac.uk>
 +- update xen.pcifront.fixes.patch with IRQ fixes from stable/bug-fixes branch
 +- skip docs - it seems to cause build failures at random points the moment.
 +
+ * Wed Jan 05 2011 Dennis Gilmore <dennis at ausil.us> 
+ - build sparc headers on sparcv9
+ 
+ * Tue Jan 04 2011 Dennis Gilmore <dennis at ausil.us> 
+ - add patch for sparc build failure
+ 
  * Tue Jan 04 2011 Kyle McMartin <kyle at redhat.com> 2.6.37-1
  - Track release of 2.6.37