Messages in this thread | | | Date | Tue, 9 Apr 2013 17:47:47 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the gpio-lw tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in drivers/gpio/gpio-vt8500.c between commit 808c513ee64b ("gpio/vt8500: Convert to devm_ioremap_resource()") from the gpio-lw tree and commit dc1010860b03 ("gpio: vt8500: Remove arch-vt8500 gpio driver") from the arm-soc tree.
The latter removed the file, so I did that and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |