Patch merged into coreboot/master: coreinfo/Makefile: change $(obj) to $(coreinfo_obj)

the following patch was just integrated into master:
commit 9c3ff1ba5209220cd41bee16015ae388ac6fce39
Author: Martin Roth 
Date:   Mon Mar 7 16:26:51 2016 -0700

coreinfo/Makefile: change $(obj) to $(coreinfo_obj)

- Rename obj to coreinfo_obj so it doesn't conflict with the obj
    variable in libpayload.

Change-Id: I2ffb06a87e30a5eeff5b0dfc0ba62b5e9ab46e26
    Signed-off-by: Martin Roth 
    Reviewed-on: https://review.coreboot.org/13938
    Tested-by: build bot (Jenkins)
    Reviewed-by: Stefan Reinauer 
    Reviewed-by: Paul Menzel

See https://review.coreboot.org/13938 for details.

-gerrit