err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 35a5d9e 06ea8e0)

author	Len Brown <len.brown@intel.com>
	Fri, 16 Jun 2006 01:28:57 +0000 (21:28 -0400)
committer	Len Brown <len.brown@intel.com>
	Fri, 16 Jun 2006 01:28:57 +0000 (21:28 -0400)
commit	69cd291c6bbc6647fe3783257c5a2e076e808f71
tree	6f65a2d7d29228129cef09343c485aad64e3a3f1	tree \| snapshot
parent	35a5d9ed9fedb74c22cb19ff7d749289473144e0	commit \| diff
parent	06ea8e08ae7e7e450b6a78e7ce5e10b3c5f954ea	commit \| diff

Pull acpi_bus_register_driver into release branch

Conflicts:

drivers/acpi/asus_acpi.c
drivers/acpi/scan.c

drivers/acpi/asus_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/char/sonypi.c	diff1 \|	diff2 \|	blob \| history
include/acpi/acpi_bus.h	diff1 \|	diff2 \|	blob \| history

Linux 2.6 source tree