Merge commit 'e205c7902f01664f4ad6dccc32ba1472e6d32d34' into upstream-merge
commitc13a8909600d2f669482486669513ccded75eb27
authorMarcelo Tosatti <mtosatti@redhat.com>
Wed, 22 Jun 2011 23:26:02 +0000 (22 20:26 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Wed, 22 Jun 2011 23:26:02 +0000 (22 20:26 -0300)
treef2ae3465b32460c6a7de66d833f8e433841230e4
parentcf35b3787999b6c1cbdcfd80eb04b85c2e5663cd
parente205c7902f01664f4ad6dccc32ba1472e6d32d34
Merge commit 'e205c7902f01664f4ad6dccc32ba1472e6d32d34' into upstream-merge

* commit 'e205c7902f01664f4ad6dccc32ba1472e6d32d34':
  Switch build system to accompanied kernel headers
  Import kernel headers
  Add kernel header update script
  kvm: x86: Save/restore FPU OP, IP and DP

Conflicts:
Makefile.target
configure

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Makefile.target
configure
target-i386/cpu.h
target-i386/kvm.c