Messages in this thread | | | Date | Mon, 12 Sep 2011 12:05:18 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the arm tree |
| |
Hi Arnd,
Today's linux-next merge of the arm-soc 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 arm-soc tree.
The latter removes this file, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |