From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 18 Mar 2013 16:34:14 +0000 (-0700)
Subject: Merge 3.9-rc3 into staging-next
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~137^2~583
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c45bb8cb72136bf23d18926113bff04c8cc90813;p=pandora-kernel.git

Merge 3.9-rc3 into staging-next

This resolves the merge error due to removing the ccg staging driver,
and picks up the other staging driver fixes that went into 3.9-rc3.

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

c45bb8cb72136bf23d18926113bff04c8cc90813
Reading git-diff-tree failed