diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 14:50:07 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 14:50:07 +0000 |
| commit | 9cb543124a2d31af42ce61a4c30765ecc8e5f1fa (patch) | |
| tree | 9ac55de78161c7eb323e7358b37d9617beb4e018 /arch/arm/Kconfig | |
| parent | 6629096a5eb861b6d91fe9c2204414d9b072d161 (diff) | |
| parent | da141b67d29a05267a9a0d56bd7856b7f3f58d44 (diff) | |
Merge branch 'for-rmk/virt/kvm/core' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 96863b86064..2daf6c06beb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2332,3 +2332,5 @@ source "security/Kconfig" source "crypto/Kconfig" source "lib/Kconfig" + +source "arch/arm/kvm/Kconfig" |