Subject: linux-next: rr/driver-core merge conflict

From: Stephen Rothwell <[email-masked]>
Date: Fri, 30 May 2008 13:20:09 +1000

Hi Greg, Rusty,

Today's linux-next merge of the rr tree got a trivial context conflict in
drivers/s390/kvm/kvm_virtio.c between "s390: Use s390_root_dev_* in
kvm_virtio" from the driver-core tree and "virtio:common-index-counters"
from the rr tree.  I did the obvious fixup and will carry it.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/