From: Linus Torvalds <torvalds@linux-foundation.org>
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: v2.6.30-rc6~43
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0016effb90589a87290a2ee721e34dc37e87b67c;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/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