linux-next: manual merge of the akpm tree with the arm-soc tree

[Stephen Rothwell]

Hi,

On Tue, 28 Feb 2012 22:54:06 -0800 Haojian Zhuang <hzhuang1 at marvell.com> wrote:
>
> Since there's the conflict on code. Does it mean that I need to re-submit
> those patches in arm-soc that should be based on commit "drivers/rtc:
> remove IRQF_DISABLED" from the akpm tree?

No, that conflict can be resolved by Linus during the next merge window
(unless someone else wants to do something about it).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120229/f24b067e/attachment.sig>