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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/w1/slaves/Kconfig between commit c0a6720977f8 ("Revert "w1: Add
1-wire slave device driver for DS28E04-100"") from the driver-core tree
and commit "w1: fix ds28e04 build, select CRC16" from the akpm tree.

The former removes the text that the latter is fixing, so I just dropped
this patch from the akpm tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au