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-Url: http://git.mmlx.us/?a=commitdiff_plain;h=36099365c7cc64e5184b66b6eb094950a13f540c;p=linux-edison.git

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 drivers/net/wireless/b43/main.c
index cae31463ead,834df5a3fb6..e9a01e3eede
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@@ -4097,9 -4098,15 +4098,15 @@@ static int b43_phy_versioning(struct b4
  			unsupported = 1;
  		break;
  #endif
+ #ifdef CONFIG_B43_PHY_HT
+ 	case B43_PHYTYPE_HT:
+ 		if (phy_rev > 1)
+ 			unsupported = 1;
+ 		break;
+ #endif
  	default:
  		unsupported = 1;
 -	};
 +	}
  	if (unsupported) {
  		b43err(dev->wl, "FOUND UNSUPPORTED PHY "
  		       "(Analog %u, Type %u, Revision %u)\n",
diff --cc include/linux/netlink.h
index fdd0188a167,8d1bcec5cc0..2e17c5dbdcb
--- 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];
  };