| commit | 0d4a42f6bd298e826620585e766a154ab460617a | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Mar 19 09:47:30 2013 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Mar 19 09:47:30 2013 +0100 |
| tree | 406d8f7778691d858dbe3e48e4bbb10e99c0a58a | |
| parent | d62b4892f3d9f7dd2002e5309be10719d6805b0f [diff] | |
| parent | a937536b868b8369b98967929045f1df54234323 [diff] |
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>