[<prev] [next>] [day] [month] [year] [list]
Date: Fri, 9 Sep 2011 11:20:42 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@...osoft.com>,
Nicolas Ferre <nicolas.ferre@...el.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the at91 tree with the arm tree
Hi all,
Today's linux-next merge of the at91 tree got a conflict in
arch/arm/mach-at91/board-usb-a9260.c between commit 2f8163baada3 ("ARM:
gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h")
from the arm tree and commit 6939fd49787e ("at91: merge board USB-A9260
and USB-A9263 together") from the at91 tree.
The latter removes the file modified by the former, so I did thet.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists