lkml.org 
[lkml]   [2011]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the arm-lpae tree with the arm tree
Hi Catalin,

On Fri, 9 Dec 2011 10:36:52 +0000 Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> The fix looks correct but Russell merged the LPAE patches into his tree
> last night and sorted out the conflicts, so you can now drop my for-next
> branch from -next (I'll still keep the kmemleak one).

OK, will do. Thanks for letting me know.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-12-09 12:15    [W:0.065 / U:0.040 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site