[kernel/rawhide/user/myoung/xendom0: 10/11] Merge branch 'rawhide/user/kyle/kernel-git' into rawhide/user/myoung/xendom0

[myoung]

commit 88f689255eedfe4f51ce49102b78c4039b7aeb5a
Merge: 4ec8ad3 0f865c9
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Mon Nov 22 21:46:41 2010 +0000

    Merge branch 'rawhide/user/kyle/kernel-git' into rawhide/user/myoung/xendom0
    
    Conflicts:
    	kernel.spec

 .gitignore                        |    5 +++--
 Makefile                          |    2 ++
 config-s390x                      |    2 ++
 kernel.spec                       |   30 +++++++++++++++++++++++++++---
 linux-2.6-i386-nx-emulation.patch |    2 +-
 sources                           |    5 +++--
 6 files changed, 38 insertions(+), 8 deletions(-)
---
diff --cc kernel.spec
index bd65a7a,1c7626b..daeb1f6
--- a/kernel.spec
+++ b/kernel.spec
@@@ -1916,9 -1899,30 +1916,33 @@@ f
  #                 ||     ||
  
  %changelog
+ * Mon Nov 22 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.rc3.git0.1
+ - Linux 2.6.37-rc3
+ 
+ * Sat Nov 20 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.rc2.git7.1
+ - Linux 2.6.37-rc2-git7
+ 
+ * Fri Nov 19 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.rc2.git5.1
+ - Linux 2.6.37-rc2-git5
+ 
+ * Thu Nov 18 2010 Kyle McMartin <kyle at redhat.com>
+ - Move %{fedora_build} in the un-released (ie: -git/-rc) kernel case for
+   a variety of reasons, principally so that:
+   1: Bumping %baserelease isn't needed if we're just updating snapshots.
+   2: %buildid will sort as newer so we don't need to bump baserelease when
+      building bugzilla fixes.
+ 
+ * Wed Nov 17 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.1.rc2.git2
+ - Linux 2.6.37-rc2-git2
+ - enable STRICT_DEVMEM on s390x.
+ 
+ * Wed Nov 17 2010 Kyle McMartin <kyle at redhat.com>
+ - Make vmlinuz/System.map root read-write only by default. You can just
+   chmod 644 them later if you (unlikely) need them without root.
+ 
 +* Tue Nov 16 2010 Michael Young <m.a.young at durham.ac.uk>
 +- Update the xen/next-2.6.37 and xen-pcifront-fixes patches
 +
  * Mon Nov 15 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.1.rc2.git0
  - Linux 2.6.37-rc2