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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/net/ieee802154/fakehard.c between commit 36426484fcac
("ieee802154: remove fakehard driver") from the wireless-next tree and
commit bb1f1107858c ("net: ieee802154: drop owner assignment from
platform_drivers") from the driver-core tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).

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

pgpJn3wxm0YCV.pgp
Description: OpenPGP digital signature