linux-next: merge error in arch/arm/mm/Kconfig?

[Stephen Rothwell]

Hi Shawn,

On Mon, 25 Jul 2011 12:40:27 +0800 Shawn Guo <shawn.guo at freescale.com> wrote:
>
> Sorry for the noise, Stephen.  I should have searched the list before
> posting.

Thanks OK, I would rather have 2 reports than none.

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