Hi Jason,
Today's linux-next merge of the irqchip tree got a conflict in
arch/arm/mach-exynos/suspend.c between commit ace283a04a4a ("ARM:
EXYNOS: Fix wrong hwirq of RTC interrupt for Exynos3250 SoC") from
Linus' tree and commit be42c9ea7b5f ("ARM: exynos4/5: convert pmu
wakeup to stacked domains") from the irqchip tree.I fixed it up (I just randomly chose to use the irqchip tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpnDbwwii1xp.pgp
Description: OpenPGP digital signature
