]> git.baikalelectronics.ru Git - kernel.git/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)
commitc29e2f3bec1d335dd5757395beeddcf4c4fbc0d1
treecd9e5ccd68e3f5c1e5286ba6e44fcc457a6a3d1f
parentc953eb4d2a0caee97621a2773fbbbf9c6b1cc491
APCI: revert duplicated patch

commit 9e40b697e3710e9bb35d4a7fde24f42c068149ea ("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 8cc45133d94c28dcc1498bb048175ea07c868d30 ("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