From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752700Ab1IUAdh (ORCPT ); Tue, 20 Sep 2011 20:33:37 -0400 Received: from calzone.tip.net.au ([203.10.76.15]:48105 "EHLO calzone.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750711Ab1IUAdg (ORCPT ); Tue, 20 Sep 2011 20:33:36 -0400 Date: Wed, 21 Sep 2011 10:33:29 +1000 From: Stephen Rothwell To: Russell King Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Walleij , Arnd Bergmann Subject: linux-next: manual merge of the arm tree with Linus' tree Message-Id: <20110921103329.c24fb7e8c8b34217c38f92b2@canb.auug.org.au> X-Mailer: Sylpheed 3.2.0beta3 (GTK+ 2.24.6; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Russell, Today's linux-next merge of the arm tree got a conflict in arch/arm/mach-integrator/integrator_ap.c between commit b71d8429ec36 ("mach-integrator: fix VGA base regression") from Linus' tree and commit b79573586838 ("ARM: 7087/2: mach-integrator: get timer frequency from clock") from the arm tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arm/mach-integrator/integrator_ap.c index 8cdc730,c698811..0000000 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@@ -32,7 -32,7 +32,8 @@@ #include #include #include + #include +#include