lkml.org 
[lkml]   [2009]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [git pull] m68knommu arch updates


On Wed, 9 Dec 2009, Greg Ungerer wrote:
>
> Please pull to get the latest m68knommu arch fixes. Not a lot in here,
> mostly small fixes. The biggest change is Tim Abbott's linker script
> cleanups.

Hmm. I got a conflict due to the other m68k changes on the file
arch/m68k/include/asm/ptrace.h.

I fixed it up the way that seemed most appropriate, but somebody should
double-check. My resolution is not identical to either source branch tree.

Linus


\
 
 \ /
  Last update: 2009-12-10 04:17    [W:0.039 / U:0.216 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site