Christoffer Dall
662d971584
arm/arm64: KVM: Kill CONFIG_KVM_ARM_{VGIC,TIMER} ...
We can definitely decide at run-time whether to use the GIC and timers
or not, and the extra code and data structures that we allocate space
for is really negligable with this config option, so I don't think it's
worth the extra complexity of always having to define stub static
inlines. The !CONFIG_KVM_ARM_VGIC/TIMER case is pretty much an untested
code path anyway, so we're better off just getting rid of it.
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
2015-03-12 15:15:27 +01:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2015-02-19 11:28:36 -08:00
OK, this has the big virtio 1.0 implementation, as specified by OASIS.
2015-02-18 09:24:01 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2015-02-14 09:47:01 -08:00
The clock framework changes for 3.20 contain the usual driver additions,
2015-02-21 12:30:30 -08:00
arm/arm64: KVM: Kill CONFIG_KVM_ARM_{VGIC,TIMER}
2015-03-12 15:15:27 +01:00
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-22 17:42:14 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-17 17:41:19 -08:00
Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block
2015-02-12 14:13:23 -08:00
ALSA: pcm: allow for trigger_tstamp snapshot in .trigger
2015-02-09 16:01:53 +01:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-02-21 13:21:19 -08:00
Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 16:12:34 -08:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-02-21 19:41:38 -08:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2015-02-16 15:48:00 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-02-10 20:01:30 -08:00
662d971584