Merge commit '98ec69ac121d1db903a28ec735b6eeef5ed64174' into upstream-merge
commit2b2cd95530d9eb52b1dbce15d78745e8a4cd7bd5
authorAvi Kivity <avi@redhat.com>
Tue, 28 Jul 2009 17:36:31 +0000 (28 20:36 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 28 Jul 2009 17:36:31 +0000 (28 20:36 +0300)
tree135d99862874c9c95031776c597fc0ba38d6e57d
parentb75e4269ec0bec4c97f29aaa6e28f8d1a1f20278
parent98ec69ac121d1db903a28ec735b6eeef5ed64174
Merge commit '98ec69ac121d1db903a28ec735b6eeef5ed64174' into upstream-merge

* commit '98ec69ac121d1db903a28ec735b6eeef5ed64174':
  rename s/config_mak/config_host_mak/ and s/config_h/config_host_h/
  simplify TARGET_ABI_DIR generation
  simplify TARGET_ARCH2 generation

Conflicts:
configure

Signed-off-by: Avi Kivity <avi@redhat.com>
Makefile.target
configure
qemu/pc-bios/extboot.bin