Merge tag 'v3.5-rc1'

Linux 3.5-rc1

Conflicts:
	net/ceph/messenger.c

1 files changed, 1 insertions, 1 deletions

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index c178c770acb4..db2da54f7336 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1216,7 +1216,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
         }
 
         if (!req->r_got_reply) {
-                unsigned bytes;
+                unsigned int bytes;
 
                 req->r_result = le32_to_cpu(rhead->result);
                 bytes = le32_to_cpu(msg->hdr.data_len);