tree 139f5c927ca7dfd96f56bbd848319481694a7134
parent b18c74c92f53572896b6f98cf69fe08c65ae2455
parent 1015cc4225542ba69cf1627a743978f304a29c71
author Junio C Hamano <gitster@pobox.com> 1343102199 -0700
committer Junio C Hamano <gitster@pobox.com> 1343102199 -0700

Merge branch 'jn/make-assembly-in-right-directory'

* jn/make-assembly-in-right-directory:
  Makefile: fix location of listing produced by "make subdir/foo.s"