From: Len Brown <len.brown@intel.com>
Date: Thu, 29 Jun 2006 23:57:46 +0000 (-0400)
Subject: merge linus into release branch
X-Git-Tag: v2.6.18-rc1~257^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d120cfb544ed6161b9d32fb6c4648c471807ee6b;p=pandora-kernel.git

merge linus into release branch

Conflicts:

	drivers/acpi/acpi_memhotplug.c
---

d120cfb544ed6161b9d32fb6c4648c471807ee6b
Reading git-diff-tree failed