Messages in this thread | | | Date | Wed, 9 Dec 2009 19:13:25 -0800 (PST) | From | Linus Torvalds <> | Subject | Re: [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
| |