Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Jan 2009 23:30:54 +0000 (15:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Jan 2009 23:31:07 +0000 (15:31 -0800)
commit0d34052dfeba307ebc18d2f672e80e3f419714d4
tree8f7955328cd9700c443c33f88631449a0c1208fb
parentf0fb2eb7bd76b9927f1350cfb0a3653385b82c6c
parent926beadb3dfaddccb3348a5b9e6c2a1f8290a220
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: create a private portion of struct device"
  Revert "driver core: move klist_children into private structure"
  Revert "driver core: move knode_driver into private structure"
  Revert "driver core: move knode_bus into private structure"