Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	include/linux/mod_devicetable.h
	scripts/mod/file2alias.c

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c
index 6f8a0e3fb25b..4db2c5e7283f 100644
--- a/fs/cifs/dns_resolve.c
+++ b/fs/cifs/dns_resolve.c
@@ -106,14 +106,14 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)
         /* search for server name delimiter */
         len = strlen(unc);
         if (len < 3) {
-                cFYI(1, ("%s: unc is too short: %s", __func__, unc));
+                cFYI(1, "%s: unc is too short: %s", __func__, unc);
                 return -EINVAL;
         }
         len -= 2;
         name = memchr(unc+2, '\\', len);
         if (!name) {
-                cFYI(1, ("%s: probably server name is whole unc: %s",
-                                        __func__, unc));
+                cFYI(1, "%s: probably server name is whole unc: %s",
+                                        __func__, unc);
         } else {
                 len = (name - unc) - 2/* leading // */;
         }
@@ -127,8 +127,8 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)
         name[len] = 0;
 
         if (is_ip(name)) {
-                cFYI(1, ("%s: it is IP, skipping dns upcall: %s",
-                                        __func__, name));
+                cFYI(1, "%s: it is IP, skipping dns upcall: %s",
+                                        __func__, name);
                 data = name;
                 goto skip_upcall;
         }
@@ -138,7 +138,7 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)
                 len = rkey->type_data.x[0];
                 data = rkey->payload.data;
         } else {
-                cERROR(1, ("%s: unable to resolve: %s", __func__, name));
+                cERROR(1, "%s: unable to resolve: %s", __func__, name);
                 goto out;
         }
 
@@ -148,10 +148,10 @@ skip_upcall:
                 if (*ip_addr) {
                         memcpy(*ip_addr, data, len + 1);
                         if (!IS_ERR(rkey))
-                                cFYI(1, ("%s: resolved: %s to %s", __func__,
+                                cFYI(1, "%s: resolved: %s to %s", __func__,
                                                         name,
                                                         *ip_addr
-                                        ));
+                                        );
                         rc = 0;
                 } else {
                         rc = -ENOMEM;