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

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index fdeb85a970fc..0e0f9d2322e3 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -1236,10 +1236,7 @@ struct sctp_endpoint {
          *            Discussion in [RFC1750] can be helpful in
          *            selection of the key.
          */
-        __u8 secret_key[SCTP_HOW_MANY_SECRETS][SCTP_SECRET_SIZE];
-        int current_key;
-        int last_key;
-        int key_changed_at;
+        __u8 secret_key[SCTP_SECRET_SIZE];
 
         /* digest:  This is a digest of the sctp cookie.  This field is
          *          only used on the receive path when we try to validate