lkml.org 
[lkml]   [2011]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [GIT PULL] arm-soc new features (part 2/2) for 3.1
On Tue, Jul 26, 2011 at 4:36 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>
> This is the final branch I have for now, although I hope to get one more
> for actual device tree conversions for a lot of drivers.

Ok, everything merged.

I compared the end result with yours, and we did some things a bit
differently, but on the whole it looks pretty identical. We have a
different resolution for "exynos4_cpu_suspend()", but afaik mine is
better (it looks like from a type standpoint it should return int, but
due to the panic it doesn't matter). And we did those
OMAP4430_DLL_OVERRIDE_SHIFT/MASK defines in a different order. I have
some other changes in my tree (Andrew's patch-set for asm/atomic.h
etc), so that makes for other differences in arch/arm, but it looks
like it's ok.

But you should double-check. I didn't compile-test any of it, I don't
do the cross-compile thing, and maybe I missed something.

Linus


\
 
 \ /
  Last update: 2011-07-27 02:55    [W:0.048 / U:1.840 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site