From: Len Brown <len.brown@intel.com>
Date: Thu, 23 Oct 2008 03:57:26 +0000 (-0400)
Subject: Merge branch 'linus' into test
X-Git-Tag: v2.6.28-rc1~26^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=057316cc6a5b521b332a1d7ccc871cd60c904c74;p=pandora-kernel.git

Merge branch 'linus' into test

Conflicts:
	MAINTAINERS
	arch/x86/kernel/acpi/boot.c
	arch/x86/kernel/acpi/sleep.c
	drivers/acpi/Kconfig
	drivers/pnp/Makefile
	drivers/pnp/quirks.c

Signed-off-by: Len Brown <len.brown@intel.com>
---

057316cc6a5b521b332a1d7ccc871cd60c904c74
Reading git-diff-tree failed