summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/vmi.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 14:04:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 14:04:03 -0700
commit81d1c3a52cd78fdbb9f0d80214fc9e7d49bf22c0 (patch)
treea9c33aaf393c64f6f31eacb6c24007ce99467aab /arch/x86/include/asm/vmi.h
parent5fe8321b8886d814e65952d74b207fe59e1096ea (diff)
parent3e0f686e6bf347eea4a41d7d415f003c2f42b1a0 (diff)
Merge branch 'stable/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6
* 'stable/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6: ibft: fix kconfig dependencies
Diffstat (limited to 'arch/x86/include/asm/vmi.h')
0 files changed, 0 insertions, 0 deletions