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, 3 deletions

diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index f25ba922baaf..58fda1c3c783 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -17,14 +17,15 @@
 
 #include <linux/atomic.h>
 #include <linux/rcupdate.h>
+#include <linux/uidgid.h>
 
 /* size of the nodename buffer */
 #define UNX_MAXNODENAME 32
 
 /* Work around the lack of a VFS credential */
 struct auth_cred {
-        uid_t   uid;
-        gid_t   gid;
+        kuid_t  uid;
+        kgid_t  gid;
         struct group_info *group_info;
         const char *principal;
         unsigned char machine_cred : 1;
@@ -48,7 +49,7 @@ struct rpc_cred {
         unsigned long           cr_flags;       /* various flags */
         atomic_t                cr_count;       /* ref count */
 
-        uid_t                   cr_uid;
+        kuid_t                  cr_uid;
 
         /* per-flavor data */
 };