Merge branch 'elflink' into firmware
commitf88b4f4712c83eb06a23450db9175f88502630f1
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 17 Jan 2014 22:23:06 +0000 (17 14:23 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 17 Jan 2014 22:23:06 +0000 (17 14:23 -0800)
tree5349e513fb7838420cdb826f0f81266610769fce
parent007b0adbe7012532ddf3172549cbb24feab4b157
parent37c0cfcc30b5b713e30b5bc741d97e909411b948
Merge branch 'elflink' into firmware

Resolved Conflict:
diag/geodsp/Makefile

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
NEWS