Merge commit '0ac6c2748cb1dc232453b507ca7c0289c457d7cc' into stable
authorJiri Slaby <jslaby@suse.cz>
Thu, 26 Jul 2012 09:10:52 +0000 (11:10 +0200)
committerJiri Slaby <jslaby@suse.cz>
Thu, 26 Jul 2012 09:14:08 +0000 (11:14 +0200)
commit8d58193002198626031acd0a3f80c6b8a46c7e71
treea6e616ba162e099737d685a5f8ece191916aaecf
parent7bced1ec6fa7a1fa8247952a7d43b3e14d33c21d
parent0ac6c2748cb1dc232453b507ca7c0289c457d7cc
Merge commit '0ac6c2748cb1dc232453b507ca7c0289c457d7cc' into stable

Conflicts:
config/armv7hl/default
config/armv7hl/imx51
config/armv7hl/omap2plus
config/armv7hl/tegra
config/armv7hl/u8500
config/i386/debug
config/i386/default
config/i386/desktop
config/i386/ec2
config/i386/pae
config/i386/trace
config/i386/vanilla
config/i386/xen
config/ia64/debug
config/ia64/default
config/ia64/trace
config/ia64/vanilla
config/ppc/default
config/ppc/ppc64
config/ppc/vanilla
config/ppc64/debug
config/ppc64/default
config/ppc64/ppc64
config/ppc64/trace
config/ppc64/vanilla
config/s390/s390
config/s390/trace
config/s390/vanilla
config/s390x/default
config/s390x/trace
config/s390x/vanilla
config/x86_64/debug
config/x86_64/default
config/x86_64/desktop
config/x86_64/ec2
config/x86_64/trace
config/x86_64/vanilla
config/x86_64/xen
patches.arch/arm-omap-add-drm.patch
patches.fixes/bridge-module-get-put.patch
patches.xen/frontswap-config
patches.xen/frontswap-core
patches.xen/frontswap-header
patches.xen/frontswap-hooks
patches.xen/pci-guestdev
patches.xen/xen-x86-bigmem
patches.xen/xen-x86-per-cpu-vcpu-info
patches.xen/xen-x86-pmd-handling
patches.xen/xen-x86_64-note-init-p2m
patches.xen/xen-x86_64-pgd-alloc-order
patches.xen/xen-x86_64-pgd-pin
patches.xen/xen3-auto-arch-i386.diff
patches.xen/xen3-auto-arch-x86.diff
patches.xen/xen3-auto-arch-x86_64.diff
patches.xen/xen3-auto-common.diff
patches.xen/xen3-auto-include-xen-interface.diff
patches.xen/xen3-auto-xen-arch.diff
patches.xen/xen3-auto-xen-drivers.diff
patches.xen/xen3-auto-xen-kconfig.diff
patches.xen/xen3-fixup-kconfig
patches.xen/xen3-fixup-xen
patches.xen/xen3-patch-2.6.18
patches.xen/xen3-patch-2.6.19
patches.xen/xen3-patch-2.6.20
patches.xen/xen3-patch-2.6.21
patches.xen/xen3-patch-2.6.22
patches.xen/xen3-patch-2.6.23
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.27
patches.xen/xen3-patch-2.6.28
patches.xen/xen3-patch-2.6.29
patches.xen/xen3-patch-2.6.30
patches.xen/xen3-patch-2.6.31
patches.xen/xen3-patch-2.6.32
patches.xen/xen3-patch-2.6.33
patches.xen/xen3-patch-2.6.34
patches.xen/xen3-patch-2.6.35
patches.xen/xen3-patch-2.6.36
patches.xen/xen3-patch-2.6.37
patches.xen/xen3-patch-2.6.38
patches.xen/xen3-patch-2.6.39
patches.xen/xen3-patch-3.0
patches.xen/xen3-patch-3.1
patches.xen/xen3-patch-3.2
patches.xen/xen3-patch-3.3
patches.xen/xen3-patch-3.4
series.conf
rpm/config.sh
series.conf