Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos/include/mach/entry-macro.S between commit
4e44d2cb95bd ("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER") from
the arm tree and commit 3a7c87154294 ("ARM: SAMSUNG: Move timer irq numbers
to end of linux irq space") from the s5p tree.
The former removed the code modified by the latter, so I did that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp4nwBvQeI2v.pgp
Description: PGP signature
