From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 2 Feb 2012 19:24:44 +0000 (-0800)
Subject: Merge 3.3-rc2 into the driver-core-next branch.
X-Git-Tag: v3.4-rc1~187^2~37
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd1d462e13b278fc57752d0b9b15040e60e561a0;p=pandora-kernel.git

Merge 3.3-rc2 into the driver-core-next branch.

This was done to resolve a merge and build problem with the
drivers/acpi/processor_driver.c file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

bd1d462e13b278fc57752d0b9b15040e60e561a0
Reading git-diff-tree failed