From: Anthony Liguori Date: Mon, 19 Nov 2012 15:27:13 +0000 (-0600) Subject: Merge remote-tracking branch 'bonzini/build-urgent' into staging X-Git-Tag: cpu-hotplug-port-v2~35 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2954525b3b8474fa1d637dd3822ab35c95596856;p=people%2Faperard%2Fqemu-dm.git Merge remote-tracking branch 'bonzini/build-urgent' into staging * bonzini/build-urgent: Makefile: Add missing dependency (fix parallel builds) tests: link in stubs libcacard: link in stubs libcacard: make unnesting rules available to Makefile.objs Signed-off-by: Anthony Liguori --- 2954525b3b8474fa1d637dd3822ab35c95596856