linux-next: manual merge of the tip tree with the arm-soc tree
sfr at canb.auug.org.au
Mon Jul 27 19:20:25 PDT 2015
Today's linux-next merge of the tip tree got a conflict in:
30f8925a57d8 ("ARM: shmobile: Remove legacy board code for KZM-A9-GT")
from the arm-soc tree and commit:
0d3f2c92e004 ("irqchip/gic: Remove redundant gic_set_irqchip_flags")
from the tip tree.
I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).
Stephen Rothwell sfr at canb.auug.org.au
More information about the linux-arm-kernel