Re: [git pull] m68knommu arch updates

[Linus Torvalds]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/