tree 355069a0cdc50c2139755e84bcc65a18b5ef7962
parent ad1db3b341d3d55e6d722ad868bd48ed4425c9fb
parent 16529cedcef18bf116f10279e9c9abb6645467d6
author Anthony Liguori <aliguori@us.ibm.com> 1353338833 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1353338833 -0600

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 <aliguori@us.ibm.com>