summaryrefslogtreecommitdiffstats
path: root/include/acpi/acpixf.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-10 00:30:54 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-10 00:31:07 +0100
commit0d34052dfeba307ebc18d2f672e80e3f419714d4 (patch)
tree8f7955328cd9700c443c33f88631449a0c1208fb /include/acpi/acpixf.h
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff)
parentRevert "driver core: create a private portion of struct device" (diff)
downloadlinux-0d34052dfeba307ebc18d2f672e80e3f419714d4.tar.xz
linux-0d34052dfeba307ebc18d2f672e80e3f419714d4.zip
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"
Diffstat (limited to 'include/acpi/acpixf.h')
0 files changed, 0 insertions, 0 deletions