Merge tag 'v3.5-rc1'

Linux 3.5-rc1

Conflicts:
	net/ceph/messenger.c

1 files changed, 2 insertions, 2 deletions

diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index c815f31a1a3f..58b09efb528d 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -441,8 +441,8 @@ EXPORT_SYMBOL(ceph_client_id);
  * create a fresh client instance
  */
 struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private,
-                                       unsigned supported_features,
-                                       unsigned required_features)
+                                       unsigned int supported_features,
+                                       unsigned int required_features)
 {
         struct ceph_client *client;
         struct ceph_entity_addr *myaddr = NULL;