From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 25 Sep 2013 15:59:04 +0000 (-0700)
Subject: Merge 3.12-rc2 into staging-next.
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~62^2~693
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b;p=pandora-kernel.git

Merge 3.12-rc2 into staging-next.

This resolves the merge problem with two iio drivers that Stephen
Rothwell pointed out.

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

e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b
Reading git-diff-tree failed