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, 4 insertions, 6 deletions

diff --git a/include/linux/async.h b/include/linux/async.h
index 7a24fe9b44b4..a2e3f18b2ad6 100644
--- a/include/linux/async.h
+++ b/include/linux/async.h
@@ -19,8 +19,7 @@ typedef u64 async_cookie_t;
 typedef void (async_func_ptr) (void *data, async_cookie_t cookie);
 struct async_domain {
         struct list_head node;
-        struct list_head domain;
-        int count;
+        struct list_head pending;
         unsigned registered:1;
 };
 
@@ -29,8 +28,7 @@ struct async_domain {
  */
 #define ASYNC_DOMAIN(_name) \
         struct async_domain _name = { .node = LIST_HEAD_INIT(_name.node), \
-                                      .domain = LIST_HEAD_INIT(_name.domain), \
-                                      .count = 0, \
+                                      .pending = LIST_HEAD_INIT(_name.pending), \
                                       .registered = 1 }
 
 /*
@@ -39,8 +37,7 @@ struct async_domain {
  */
 #define ASYNC_DOMAIN_EXCLUSIVE(_name) \
         struct async_domain _name = { .node = LIST_HEAD_INIT(_name.node), \
-                                      .domain = LIST_HEAD_INIT(_name.domain), \
-                                      .count = 0, \
+                                      .pending = LIST_HEAD_INIT(_name.pending), \
                                       .registered = 0 }
 
 extern async_cookie_t async_schedule(async_func_ptr *ptr, void *data);
@@ -52,4 +49,5 @@ extern void async_synchronize_full_domain(struct async_domain *domain);
 extern void async_synchronize_cookie(async_cookie_t cookie);
 extern void async_synchronize_cookie_domain(async_cookie_t cookie,
                                             struct async_domain *domain);
+extern bool current_is_async(void);
 #endif