From: Len Brown <len.brown@intel.com>
Date: Sun, 15 Aug 2010 05:06:31 +0000 (-0400)
Subject: Merge branch 'linus' into release
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~5990^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=95ee46aa8698f2000647dfb362400fadbb5807cf;p=mirror_ubuntu-zesty-kernel.git

Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

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

95ee46aa8698f2000647dfb362400fadbb5807cf