lkml.org 
[lkml]   [2012]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the irqdomain tree with Linus' tree
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@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-02-14 05:39    [W:0.026 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site