update ...
Merge branch 'SayCV_SAM9X25' of https://github.com/SayCV/barebox-at91 into SayCV_SAM9X25

Conflicts:
	arch/arm/lib/bootm.c