From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 19 Mar 2013 08:47:30 +0000 (+0100)
Subject: Merge tag 'v3.9-rc3' into drm-intel-next-queued
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~55^2~60^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d4a42f6bd298e826620585e766a154ab460617a;p=pandora-kernel.git

Merge tag 'v3.9-rc3' into drm-intel-next-queued

Backmerge so that I can merge Imre Deak's coalesced sg entries fixes,
which depend upon the new for_each_sg_page introduce in

commit a321e91b6d73ed011ffceed384c40d2785cf723b
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Feb 27 17:02:56 2013 -0800

    lib/scatterlist: add simple page iterator

The merge itself is just two trivial conflicts:

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

0d4a42f6bd298e826620585e766a154ab460617a
Reading git-diff-tree failed