linux-next: manual merge of the trivial tree with the ux500-coretree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-u300/gpio.c between commit 4a5a6e2804a3 ("mach-u300:
rewrite gpio driver, move to drivers/gpio") from the ux500-core tree and
commit b0c3af5ef0d7 ("arm: mach-u300/gpio: Fix mem_region resource size
miscalculations") from the trivial tree.

The former removed the file updated by the latter.  These updates should
be applied to drivers/gpio/u300-gpio.c, now.  Joe, maybe you could update
your patch and send it to Linus Walleij.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature