Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
	net/wireless/nl80211.c

diff --cc drivers/cpufreq/cpufreq_governor.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_governor.h
Simple merge

diff --cc drivers/cpufreq/cpufreq_stats.c
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc net/wireless/nl80211.c
index 9abf1969c114c259125b49d88fd333089665e853,62aebed7c6e20bf012464794e2878b18e3cf8a14..43ab4b03d306119b5546fe3c8cdae4432cee28b1
--- 1/net/wireless/nl80211.c
--- 2/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -6642,17 -6597,15 +6642,20 @@@ void __cfg80211_send_event_skb(struct s
        void *hdr = ((void **)skb->cb)[1];
        struct nlattr *data = ((void **)skb->cb)[2];
  
+       /* clear CB data for netlink core to own from now on */
+       memset(skb->cb, 0, sizeof(skb->cb));
+ 
        nla_nest_end(skb, data);
        genlmsg_end(skb, hdr);
 -      genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), skb, 0,
 -                              nl80211_testmode_mcgrp.id, gfp);
 +
 +      if (data->nla_type == NL80211_ATTR_VENDOR_DATA)
 +              genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), skb, 0,
 +                      nl80211_vendor_mcgrp.id, gfp);
 +      else
 +              genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), skb, 0,
 +                      nl80211_testmode_mcgrp.id, gfp);
  }
 -EXPORT_SYMBOL(cfg80211_testmode_event);
 +EXPORT_SYMBOL(__cfg80211_send_event_skb);
  #endif
  
  static int nl80211_connect(struct sk_buff *skb, struct genl_info *info)