linux-next: manual merge of the kvm tree

From: Stephen Rothwell <hidden>
Date: 2008-08-15 04:46:50 

Hi all,

Today's linux-next merge of the kvm tree got a trivial conflict in
include/asm-x86/kvm.h between commit
77ef50a522717fa040636ee1017179ceba12ff62 ("x86: consolidate header
guards") from the x86 tree and commit
caa03c6696f78684a8396c63518fc84ed5922d44 ("KVM: Move KVM TRACE
DEFINITIONS to common header") from the kvm tree.

I fixed it up.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Attachments

  • (unnamed) [application/pgp-signature] 197 bytes
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help