Remove stray merge marker from ChangeLog

A merge marker has been left in the ChangeLog at some point, remove
now.
Add start and stop triggers to dhrystone and whetstone bencharks.

The benchmarks dhrystone and whetstone are missing the start, stop, and
initialise triggers, I'm adding them in this patch.

ChangeLog:

	* src/dhrystone/dhry_1.c: Add start and stop triggers.
	* src/whetstone/whetstone.c: Likewise.