From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 24 Jun 2011 19:25:51 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.1-rc1~316^2~350^2
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=36099365c7cc64e5184b66b6eb094950a13f540c

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/rtlwifi/pci.c
	include/linux/netlink.h
---

36099365c7cc64e5184b66b6eb094950a13f540c
diff --cc include/linux/netlink.h
index fdd0188a167e,8d1bcec5cc06..2e17c5dbdcb8
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@@ -221,8 -221,8 +222,9 @@@ struct netlink_callback 
  	int			(*dump)(struct sk_buff * skb,
  					struct netlink_callback *cb);
  	int			(*done)(struct netlink_callback *cb);
 -	int			family;
 +	u16			family;
 +	u16			min_dump_alloc;
+ 	unsigned int		prev_seq, seq;
  	long			args[6];
  };