]> err.no Git - linux-2.6/commit
Pull novell-bugzilla-156426 into release branch
authorLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:38:30 +0000 (15:38 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:38:30 +0000 (15:38 -0400)
commit4e8f10b7ccf1c3c53a818a157962074a7340732e
treeb5b60b535b9068541bd7c1504216c2428c5cb109
parent63518472c05a351d779f35803e6ccfb361ae630a
parent9cfda2c94df61c9f859b474abe774c65a4464d0a
Pull novell-bugzilla-156426 into release branch

Conflicts:

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