linux-next: manual merge of the driver-core tree with the renesas tree

Stephen Rothwell
2014-07-25T06:24:08Z

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/mach-shmobile/setup-r7s72100.c between commit 9394af431455
("ARM: shmobile: genmai-reference: Enable MTU2 in device tree") from
the renesas tree and commit d2168146c222 ("platform: Remove most
references to platform_bus device") from the driver-core tree.

I fixed it up (the former removed the code that the latter modified)
and can carry the fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]