From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 Sep 2012 00:17:25 +0000 (-0700)
Subject: Merge 3.6-rc6 into staging-next
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~75^2~230
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a2a2cdd57d11ee3117539b846a45df6efbd35b1;p=pandora-kernel.git

Merge 3.6-rc6 into staging-next

This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.

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

6a2a2cdd57d11ee3117539b846a45df6efbd35b1
Reading git-diff-tree failed