Merge commit '42bc608b2a144dfa5141dd6ba5d12cb97ac804a7' into upstream-merge
commitdd93aa4ddbda4a3b69fd04d16407868b5de9df00
authorAvi Kivity <avi@redhat.com>
Tue, 28 Jul 2009 17:45:46 +0000 (28 20:45 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 28 Jul 2009 17:45:46 +0000 (28 20:45 +0300)
tree281ca109032e849b7d31759093b7ef2e27f36dd4
parent2b2cd95530d9eb52b1dbce15d78745e8a4cd7bd5
parent42bc608b2a144dfa5141dd6ba5d12cb97ac804a7
Merge commit '42bc608b2a144dfa5141dd6ba5d12cb97ac804a7' into upstream-merge

* commit '42bc608b2a144dfa5141dd6ba5d12cb97ac804a7':
  Generate $target_dir/config.h from $target_dir/config.mak
  Refactor config_softfloat selection in another list

Conflicts:
configure
create_config (support USE_KVM_*)

Signed-off-by: Avi Kivity <avi@redhat.com>
configure
create_config