lkml.org 
[lkml]   [2010]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
DateMon, 11 Oct 2010 09:48:36 +0200
FromAnders Larsen <>
SubjectRe: linux-next: manual merge of the arm tree with the arm-current tree
On 2010-10-11 03:24:41, Stephen Rothwell wrote:
> Today's linux-next merge of the arm tree got a conflict in
> arch/arm/mach-at91/include/mach/system.h between commit
> 5c189208b606a85b4e97109af70d59f10a42fdfd ("ARM: 6436/1: AT91: Fix
> power-saving in idle-mode on 926T processors") from the arm-current tree
> and commit cb809b1a5ebffca8cf0314b788919989e8e4ab5f ("AT91: fix use of
> clock disable on idle for AT91x40 devices") from the arm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Acked-by: Anders Larsen <al@alarsen.net>

Thanks
Anders (Author of "...6436/1...")



\
 
 \ /
  Last update: 2010-10-11 09:51    [from the cache]
©2003-2010