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>

1 files changed, 0 insertions, 8 deletions

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 70473da47b3f..6d53675c2b54 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -303,21 +303,13 @@ static inline void __SetPageUptodate(struct page *page)
 
 static inline void SetPageUptodate(struct page *page)
 {
-#ifdef CONFIG_S390
-        if (!test_and_set_bit(PG_uptodate, &page->flags))
-                page_set_storage_key(page_to_phys(page), PAGE_DEFAULT_KEY, 0);
-#else
         /*
          * Memory barrier must be issued before setting the PG_uptodate bit,
          * so that all previous stores issued in order to bring the page
          * uptodate are actually visible before PageUptodate becomes true.
-         *
-         * s390 doesn't need an explicit smp_wmb here because the test and
-         * set bit already provides full barriers.
          */
         smp_wmb();
         set_bit(PG_uptodate, &(page)->flags);
-#endif
 }
 
 CLEARPAGEFLAG(Uptodate, uptodate)