Marc Zyngier 2b5e1e474f ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS ...

Commit bbacc0c (KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS)
broke KVM/ARM by changing a global #define.

Apply the same change to fix the compilation breakage.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>

2013-02-25 11:47:59 +02:00

..

boot

Merge tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2013-02-24 20:00:58 -08:00

common

ARM: GIC: fix GIC cpumask initialization

2013-02-08 10:17:22 +00:00

configs

Merge branch 'akpm' (incoming from Andrew)

2013-02-21 17:38:49 -08:00

crypto

ARM: 7626/1: arm/crypto: Make asm SHA-1 and AES code Thumb-2 compatible

2013-01-13 12:41:22 +00:00

include

ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS

2013-02-25 11:47:59 +02:00

kernel

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2013-02-23 18:50:11 -08:00

kvm

ARM: KVM: fix kvm_arch_{prepare,commit}_memory_region

2013-02-25 11:47:28 +02:00

lib

…

mach-at91

Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:38:49 -08:00

mach-bcm

Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc

2013-01-24 17:57:20 +09:00

mach-bcm2835

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:27:22 -08:00

mach-clps711x

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-cns3xxx

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-davinci

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2013-02-24 17:35:10 -08:00

mach-dove

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-ebsa110

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-ep93xx

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-exynos

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2013-02-24 17:35:10 -08:00

mach-footbridge

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-gemini

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-h720x

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-highbank

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-imx

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:27:22 -08:00

mach-integrator

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-iop13xx

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-iop32x

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-iop33x

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-ixp4xx

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-kirkwood

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:27:22 -08:00

mach-ks8695

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-l7200/include/mach

…

mach-lpc32xx

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-mmp

Merge branch 'akpm' (incoming from Andrew)

2013-02-21 17:38:49 -08:00

mach-msm

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-mv78xx0

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-mvebu

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-mxs

Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:38:49 -08:00

mach-netx

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-nomadik

Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:38:49 -08:00

mach-omap1

Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:33:45 -08:00

mach-omap2

Merge tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2013-02-24 20:00:58 -08:00

mach-orion5x

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-picoxcell

Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc

2013-01-24 17:57:20 +09:00

mach-prima2

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:27:22 -08:00

mach-pxa

Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:33:45 -08:00

mach-realview

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-rpc

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-s3c24xx

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-s3c64xx

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-s5p64x0

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-s5pc100

Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc

2013-01-24 17:57:20 +09:00

mach-s5pv210

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2013-02-24 17:35:10 -08:00

mach-sa1100

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-shark

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

2013-02-05 10:26:20 -08:00

mach-shmobile

Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:33:45 -08:00

mach-socfpga

Merge branch 'socfpga/hw' into next/soc

2013-02-11 19:37:51 -08:00

mach-spear3xx

Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc

2013-01-24 17:57:20 +09:00

mach-spear6xx

Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc

2013-01-24 17:57:20 +09:00

mach-spear13xx

Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc

2013-01-24 17:57:20 +09:00

mach-sunxi

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-tegra

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:27:22 -08:00

mach-u300

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:12:18 -08:00

mach-ux500

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-versatile

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-vexpress

Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup

2013-01-28 10:20:34 -07:00

mach-virt

ARM: mach-virt: fixup machine descriptor after removal of sys_timer

2013-02-11 10:39:30 -08:00

mach-vt8500

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:27:22 -08:00

mach-w90x900

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

mach-zynq

arm: zynq: Add missing irqchip.h to common.c

2013-01-29 10:55:28 -08:00

mm

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:27:22 -08:00

net

ARM: net: bpf_jit: fix emit_swap16() for non ARMv6+.

2013-02-14 13:26:44 -05:00

nwfpe

…

oprofile

…

plat-iop

ARM: use clockevents_config_and_register() where possible

2013-01-14 10:12:42 -08:00

plat-omap

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:20:41 -08:00

plat-orion

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

plat-pxa

ARM: drivers: remove __dev* attributes.

2013-01-03 15:57:04 -08:00

plat-samsung

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 14:58:40 -08:00

plat-spear

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:12:18 -08:00

plat-versatile

Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into kvm-arm/timer

2013-02-11 19:03:52 +00:00

tools

…

vfp

ARM: 7627/1: Predicate preempt logic on PREEMP_COUNT not PREEMPT alone

2013-01-16 16:51:10 +00:00

xen

xen: implement updated XENMEM_add_to_physmap_range ABI

2013-02-19 22:01:55 -05:00

Kconfig

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2013-02-23 18:50:11 -08:00

Kconfig-nommu

…

Kconfig.debug

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:27:22 -08:00

Makefile

Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-21 15:40:16 -08:00