Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c

1 files changed, 1 insertions, 1 deletions

diff --git a/include/net/netlink.h b/include/net/netlink.h
index 76c43ff38f64..3643bbb8e585 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -698,7 +698,7 @@ static inline int nla_len(const struct nlattr *nla)
  */
 static inline int nla_ok(const struct nlattr *nla, int remaining)
 {
-        return remaining >= sizeof(*nla) &&
+        return remaining >= (int) sizeof(*nla) &&
                nla->nla_len >= sizeof(*nla) &&
                nla->nla_len <= remaining;
 }