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

Hi Linus,

Linus Torvalds wrote:
>
> 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.

The end result looks fine to me.

Regards
Greg


--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com


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