linux-next: upstream/rr merge conflict

Hi Rusty,

Today's linux-next merge of the rr tree got conflicts in
drivers/char/hw_random/Kconfig and drivers/char/hw_random/virtio-rng.c
between commit f7f510ec195781c857ab76366a3e1c59e1caae42 ("virtio: An
entropy device, as suggested by hpa.") from Linus' tree and commit
15336e56adc531fba3cf52123464e2b22b85c1cc ("virtio:entropy-device") from
the rr tree.  I used the versions in Linus' tree and I assume that the
latter patch needs removing from the rr tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/