Hi Haavard,
Today's linux-next merge of the avr32 tree got conflicts in arch/avr32/mach-at32ap/at32ap700x.c and arch/avr32/mach-at32ap/pm.c between commit 3663b736a5083b3bce74520b637f630f01f66a7f ("avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>") from the arm-current tree and the avr32 tree.
The include files seem to have moved around quite a bit, so I didn't
apply the avr32 tree for today. Hopefully, the arm-current tree will
migrate to Linus' tree soon and then the avr32 tree can be updated to
reflect the changes.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp9IrHYV2y18.pgp
Description: PGP signature
