linux-next: manual merge of the irqdomain tree with the powerpc tree

Stephen Rothwell sfr at
Fri Mar 9 17:48:08 EST 2012

Hi Grant,

Today's linux-next merge of the irqdomain tree got a conflict in
arch/powerpc/platforms/iseries/irq.c between commit 8ee3e0d69623
("powerpc: Remove the main legacy iSerie platform code") from the  tree
and three commits from the irqdomain tree.

I just removed the file.
Stephen Rothwell                    sfr at
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <>

More information about the Linuxppc-dev mailing list