From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 9 Mar 2012 20:35:53 +0000 (-0800)
Subject: Merge 3.3-rc6 into driver-core-next
X-Git-Tag: v3.4-rc1~187^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=263a5c8e16c34199ddf6de3f102e789ffa3ee26e;p=pandora-kernel.git

Merge 3.3-rc6 into driver-core-next

This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

263a5c8e16c34199ddf6de3f102e789ffa3ee26e
Reading git-diff-tree failed