From: Linus Torvalds Date: Sun, 10 May 2009 17:49:31 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 X-Git-Tag: firefly_0821_release~14202 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0016effb90589a87290a2ee721e34dc37e87b67c;p=firefly-linux-kernel-4.4.55.git Merge git://git./linux/kernel/git/gregkh/driver-core-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: Revert driver core: move platform_data into platform_device Revert driver core: fix passing platform_data Remove old PRINTK_DEBUG config item Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense Driver core: platform: fix kernel-doc warnings --- 0016effb90589a87290a2ee721e34dc37e87b67c