elf move merge botched

[Andreas Schwab]

Andreas Jaeger <aj@suse.com> writes:

> Sorry for the screwup, seems the final git merge did not work out as
> intented ;-(

Looks like you merged the wrong branch (and you shouldn't have done the
extra merge of master).

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."