Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/usb/core/devio.c between commit
e04199b2167e88f0e2d0410fafaa2c35ff7ba8c1 ("usbfs: don't store bad
pointers in registration") from Linus' tree and commits
56d207f2504091e7a173640b91cb39072a2f4542 ("device create: usb: convert
device_create to device_create_drvdata")
0de4509ad6495261fba5ebb539ac6fbb5cf66999 ("device create: usb: convert
device_create_drvdata to device_create") from the driver-core tree.

I did the (reasonably obvious) fixup in usb_classdev_add.  Probably worth
a check when I publish the tree.

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