Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Fri, 22 Mar 2013 08:24:50 +0000 (09:24 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 22 Mar 2013 08:24:50 +0000 (09:24 +0100)
commitadf7d2323d626d9fc112991ee65676365e40882b
treefaf7cc5de8626ca24291e28de8b0860b67c8479d
parent2e91b11790606965b3d52632c4b033506571ac51
parentcb8318cd9ae7c00838059e552e009861b26fa569
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
patches.xen/xen-blkback-cdrom
patches.xen/xen-blkback-discard
patches.xen/xen-blkback-discard-secure
patches.xen/xen-clockevents
patches.xen/xen-configurable-guest-devices
patches.xen/xen-ipi-per-cpu-irq
patches.xen/xen-op-packet
patches.xen/xen-unpriv-build
patches.xen/xen-virq-per-cpu-irq
patches.xen/xen-x86-per-cpu-vcpu-info
patches.xen/xen-x86_64-unmapped-initrd
patches.xen/xen3-auto-common.diff
patches.xen/xen3-drm-i915-load-a-ring-frequency-scaling-table-v3
patches.xen/xen3-patch-2.6.19
patches.xen/xen3-patch-2.6.24
patches.xen/xen3-patch-2.6.25
patches.xen/xen3-patch-2.6.26
patches.xen/xen3-patch-2.6.30
patches.xen/xen3-patch-2.6.34
patches.xen/xen3-patch-2.6.39
patches.xen/xen3-patch-3.0
series.conf

suse-commit: 4fb3d527cddc748df01e4d3c563012106c90525f
mm/page_alloc.c