]> err.no Git - linux-2.6/commit
APCI: revert duplicated patch
authorThomas Gleixner <tglx@linutronix.de>
Thu, 17 Jul 2008 23:11:38 +0000 (01:11 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2008 00:14:57 +0000 (17:14 -0700)
commit392798a17b6afba5928bc577aeb7bc83a1585534
treecd9e5ccd68e3f5c1e5286ba6e44fcc457a6a3d1f
parent4e4f64da58bc71a139722bb5013adda0f7ca4e78
APCI: revert duplicated patch

commit 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0 ("dock: bay: Don't call
acpi_walk_namespace() when ACPI is disabled.") was merged between
2.6.26-rc8 and -rc9)

Due to rebasing the ACPI tree via quilt the same patch got applied again
via commit cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca ("dock: bay: Don't
call acpi_walk_namespace() when ACPI is disabled.")

Revert it, as it is obviously bogus.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/acpi/bay.c
drivers/acpi/dock.c