Catalin Marinas 63917f0b5b Merge branch 'kvm-arm64/kvm-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into upstream ... * 'kvm-arm64/kvm-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms: (33 commits) arm64: KVM: document kernel object mappings in HYP arm64: KVM: MAINTAINERS update arm64: KVM: userspace API documentation arm64: KVM: enable initialization of a 32bit vcpu arm64: KVM: 32bit guest fault injection arm64: KVM: 32bit specific register world switch arm64: KVM: CPU specific 32bit coprocessor access arm64: KVM: 32bit handling of coprocessor traps arm64: KVM: 32bit conditional execution emulation arm64: KVM: 32bit GP register access arm64: KVM: define 32bit specific registers arm64: KVM: Build system integration arm64: KVM: PSCI implementation arm64: KVM: Plug the arch timer ARM: KVM: timer: allow DT matching for ARMv8 cores arm64: KVM: Plug the VGIC arm64: KVM: Exit handling arm64: KVM: HYP mode world switch implementation arm64: KVM: hypervisor initialization code arm64: KVM: guest one-reg interface ... Conflicts: arch/arm64/Makefile		2013-06-12 16:48:38 +01:00
..
acpi	ACPI / PM: Allow device power states to be used for CONFIG_PM unset	2013-05-22 00:19:28 +02:00
asm-generic	Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-05-05 13:23:27 -07:00
clocksource	ARM: late Exynos multiplatform changes	2013-05-07 11:28:42 -07:00
crypto
drm	Merge branch 'drm-radeon-sun-hainan' of git://people.freedesktop.org/~airlied/linux	2013-05-21 08:50:57 -07:00
dt-bindings
keys
linux	aerdrv: Move cper_print_aer() call out of interrupt context	2013-05-30 10:51:20 -07:00
math-emu
media	Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-05-01 09:57:04 -07:00
memory
misc
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2013-05-20 15:19:01 -04:00
pcmcia
ras
rdma
rxrpc
scsi	Merge branch 'postmerge' into for-linus	2013-05-10 07:54:01 -07:00
sound	sound fixes for v3.10-rc1	2013-05-10 07:51:56 -07:00
target	target: Propigate up ->cmd_kref put return via transport_generic_free_cmd	2013-05-31 01:21:23 -07:00
trace	Fixed regressions (two stability regressions and a performance	2013-05-14 09:30:54 -07:00
uapi	arm64: KVM: enable initialization of a 32bit vcpu	2013-06-12 16:42:18 +01:00
video	Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into linux-fbdev/for-3.10-fixes	2013-05-29 17:00:34 +08:00
xen	Introduce Xen support to ARM64	2013-06-12 16:11:35 +01:00
Kbuild	UAPI: remove empty Kbuild files	2013-04-30 17:04:09 -07:00