linux-next: manual merge of the irqdomain tree with Linus' tree

[Stephen Rothwell]

Hi Grant,

Today's linux-next merge of the irqdomain tree got a conflict in
drivers/mfd/twl-core.c between commit 6252547b8a7a ("ARM: omap: fix
broken twl-core dependencies and ifdefs") from Linus' tree and commit
7da5a66bbf1f ("irq_domain: Remove 'new' irq_domain in favour of the ppc
one") from the irqdomain tree.

The latter removes the code modified by the former, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature