Subject: linux-next: manual merge of the driver-core.current tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 24 Jul 2008 10:57:53 +1000

Hi Greg,

Today's linux-next merge of the driver-core.current tree got a conflict
in drivers/dca/dca-sysfs.c between commit
7f1b358a236ee9c19657a619ac6f2dcabcaa0924 ("I/OAT: I/OAT version 3.0
support") from Linus' tree and commit
25070eca3d7d3a04e45ceeb37c15ef73800817b0 ("device create: misc: convert
device_create_drvdata to device_create") from the driver-core.current
tree.

The former changed the last parameter to device_create_drvdata().  I did
the obvious fixup.

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