3d172d Merge branch 'master' into master-mkspec

Merged and Committed by Michal Marek 15 years ago
46 files changed. 3859 lines added. 30555 lines removed.
config.conf
file modified
+0 -7
config/i386/debug
file modified
+352 -221
config/i386/default
file modified
+260 -158
config/i386/pae
file modified
+260 -153
config/i386/rt
file removed
-5104
config/i386/rt_debug
file removed
-5107
config/i386/trace
file modified
+311 -198
config/i386/vanilla
file modified
+308 -194
config/i386/xen
file modified
+217 -135
config/ia64/debug
file modified
+50 -2
config/ia64/default
file modified
+50 -2
config/ia64/trace
file modified
+50 -2
config/ia64/vanilla
file modified
+50 -2
config/ppc/default
file modified
+51 -2
config/ppc/kdump
file modified
+48 -2
config/ppc/ppc64
file modified
+51 -2
config/ppc/ps3
file modified
+19 -2
config/ppc/rt
file removed
-3947
config/ppc/vanilla
file modified
+51 -2
config/ppc64/debug
file modified
+51 -2
config/ppc64/default
file modified
+51 -2
config/ppc64/kdump
file modified
+48 -2
config/ppc64/ppc64
file modified
+51 -2
config/ppc64/vanilla
file modified
+51 -2
config/s390/default
file modified
+16 -2
config/s390/s390
file modified
+16 -2
config/s390/vanilla
file modified
+16 -2
config/x86_64/debug
file modified
+312 -172
config/x86_64/default
file modified
+230 -126
config/x86_64/rt
file removed
-4846
config/x86_64/rt_debug
file removed
-4828
config/x86_64/rt_timing
file removed
-4910
config/x86_64/trace
file modified
+268 -137
config/x86_64/vanilla
file modified
+248 -129
config/x86_64/xen
file modified
+218 -125
kernel-source.changes
file modified
+76 -0
patches.fixes/xfs-export-debug
file added
+22
patches.rpmify/rpm-kernel-config
file modified
+6 -7
patches.rpmify/split-package
file added
+33
patches.xen/sfc-resource-driver
file modified
+1 -1
rpm/kernel-binary.spec.in
file modified
+2 -6
rpm/modversions
file modified
+2 -0
scripts/config.sh
file modified
+1 -1
scripts/sequence-patch.sh
file modified
+9 -8
scripts/tar-up_and_run_mbuild.sh
file modified
+1 -1
series.conf
file modified
+2 -0
    Merge branch 'master' into master-mkspec
    
    Conflicts:
    	config.conf
    
        
file modified
+0 -7
file modified
+352 -221
file modified
+260 -158
file modified
+260 -153
file removed
-5104
file removed
-5107
file modified
+311 -198
file modified
+308 -194
file modified
+217 -135
file modified
+50 -2
file modified
+50 -2
file modified
+50 -2
file modified
+50 -2
file modified
+51 -2
file modified
+48 -2
file modified
+51 -2
file modified
+19 -2
file removed
-3947
file modified
+51 -2
file modified
+51 -2
file modified
+51 -2
file modified
+48 -2
file modified
+51 -2
file modified
+51 -2
file modified
+16 -2
file modified
+16 -2
file modified
+16 -2
file modified
+312 -172
file modified
+230 -126
file removed
-4846
file removed
-4828
file removed
-4910
file modified
+268 -137
file modified
+248 -129
file modified
+218 -125
file modified
+76 -0
file modified
+2 -6
file modified
+2 -0
file modified
+1 -1
file modified
+9 -8
file modified
+2 -0