Merge commit 'a8e492c07f31799a5e5b7032659953a303fd778f' into upstream-merge
commite5470d0bc2e9a5cd63b2dc418811546e3dc031ee
authorAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 11:25:01 +0000 (30 14:25 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 11:25:01 +0000 (30 14:25 +0300)
tree065fa54e7a2fcc7eaf08194811ca243e4aaa6670
parent628922f53c5f9934f1624f50480b4280d20ee36f
parenta8e492c07f31799a5e5b7032659953a303fd778f
Merge commit 'a8e492c07f31799a5e5b7032659953a303fd778f' into upstream-merge

* commit 'a8e492c07f31799a5e5b7032659953a303fd778f':
  Rename OBJS to obj-y

Conflicts:
Makefile.target

Signed-off-by: Avi Kivity <avi@redhat.com>
Makefile.target