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

Merge branch 'ull' into test

Conflicts:
	drivers/acpi/bay.c
	drivers/acpi/dock.c
	drivers/ata/libata-acpi.c

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

7674416db4ee3d43813dddb650364ca994755256
Reading git-diff-tree failed