From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 Jun 2013 18:57:00 +0000 (-0700)
Subject: Merge 3.10-rc6 into staging-next
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~76^2~164
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72992bc1fdbb7d6f5ede60e02fee87e81ef98ace;p=pandora-kernel.git

Merge 3.10-rc6 into staging-next

We want the fixes in here as well.

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

72992bc1fdbb7d6f5ede60e02fee87e81ef98ace
Reading git-diff-tree failed