tree 8f7955328cd9700c443c33f88631449a0c1208fb
parent f0fb2eb7bd76b9927f1350cfb0a3653385b82c6c
parent 926beadb3dfaddccb3348a5b9e6c2a1f8290a220
author Linus Torvalds <torvalds@linux-foundation.org> 1231543854 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231543867 -0800

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: 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"