From mboxrd@z Thu Jan  1 00:00:00 1970
From: Graeme Russ <graeme.russ@gmail.com>
Date: Fri, 15 Jul 2011 10:01:17 +1000
Subject: [U-Boot] [PATCH v1 (WIP) 05/16] [Timer]Remove reset_timer() for
 non-Nios2 arches
In-Reply-To: <20110711220232.D1BFE1579E14@gemini.denx.de>
References: <1309261269-4363-1-git-send-email-graeme.russ@gmail.com>
	<1309261269-4363-6-git-send-email-graeme.russ@gmail.com>
	<20110711220232.D1BFE1579E14@gemini.denx.de>
Message-ID: <4E1F834D.1010301@gmail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 12/07/11 08:02, Wolfgang Denk wrote:
> Dear Graeme Russ,
> 
> In message <1309261269-4363-6-git-send-email-graeme.russ@gmail.com> you wrote:
>>
>> Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
> 
> Seems this patch conflicts with 03/16, which apparently already removed
> the same code, at least in some places?

The conflict was due to a recent patch submitted outside this series -
Fixed during rebase

Regards,

Graeme