From: Len Brown <len.brown@intel.com>
Date: Thu, 15 Jun 2006 19:38:30 +0000 (-0400)
Subject: Pull novell-bugzilla-156426 into release branch
X-Git-Tag: v2.6.18-rc1~1081^2~19^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e8f10b7ccf1c3c53a818a157962074a7340732e;p=pandora-kernel.git

Pull novell-bugzilla-156426 into release branch

Conflicts:

	arch/i386/kernel/acpi/boot.c
---

4e8f10b7ccf1c3c53a818a157962074a7340732e
Reading git-diff-tree failed