diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-01-24 10:37:49 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2013-01-24 10:37:49 +0000 |
| commit | da141b67d29a05267a9a0d56bd7856b7f3f58d44 (patch) | |
| tree | 6b39b7036affbb3af421d105a8dbdf9f30a59079 /arch/arm/Kconfig | |
| parent | 6abc749f635005be78dfcb562c2235511965db6d (diff) | |
| parent | a749474de5f0f5902f59acb5c7f4dc6b816ac788 (diff) | |
Merge branch 'for-will/kvm/core' of git://github.com/virtualopensystems/linux-kvm-arm into for-rmk/virt/kvm/core
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 67874b82a4e..e0627cdbcda 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2322,3 +2322,5 @@ source "security/Kconfig" source "crypto/Kconfig" source "lib/Kconfig" + +source "arch/arm/kvm/Kconfig" |