1. 11 Apr, 2013 19 commits
  2. 10 Apr, 2013 3 commits
    • David S. Miller's avatar
      Merge branch 'wireless' · e355fbbc
      David S. Miller authored
      John W. Linville says:
      
      ====================
      Please accept this pull request for the 3.10 stream...
      
      Regarding the mac80211 bits, Johannes says:
      
      "Here I have a bunch of minstrel fixes from Felix, per-interface
      multicast filtering from Alex, set_tim debouncing from Ilan,
      per-interface debugfs cleanups from Stanislaw, an error return fix from
      Wei and a number of small improvements and fixes that I made myself."
      
      And for the iwlwifi bits, Johannes says:
      
      "Andrei changed an instance of kmalloc+memdup to kmemdup, Stanislaw
      removed the now unused 5ghz_disable module parameter. I also have a
      number of fixes from Ilan, Emmanuel and myself, Emmanuel also continued
      working on Bluetooth coexistence."
      
      For the sizeable batch of Bluetooth bits, Gustavo says:
      
      "This is our first batch of patches for 3.10. The biggest changes of this pull
      request are from Johan Hedberg, he implemented a HCI request framework to make
      life easier when we have to send many HCI commands and a block and wait for
      all of the to finish, we were able to fix a few issues in stack with the
      introduction of this framework.
      
      Other than that Dean Jenkins did a good work cleaning the RFCOMM code, the
      refcnt infrastructure was removed and now we use NULL pointer checks to know
      when a object was freed or not. That code was buggy and now it looks a way
      better.
      
      The rest of changes are clean ups, fixes and small improvements all over the
      Bluetooth subsystem."
      
      Regarding the wl12xx bits, Luca says:
      
      "Some patches intended for 3.10.  Mostly bug fixes and other small
      improvements."
      
      On top of that, there are updates to brcmfmac, brcmsmac, b43, ssb and
      bcma, as well as mwifiex, rt2x00, and ath9k and a few others.  The most
      notable bit is the addition of a new driver in the rtlwifi family.
      
      Please let me know if there are problems!
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e355fbbc
    • John W. Linville's avatar
      Merge branch 'master' of... · d3641409
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
      
      Conflicts:
      	drivers/net/wireless/rt2x00/rt2x00pci.c
      	net/mac80211/sta_info.c
      	net/wireless/core.h
      d3641409
    • John W. Linville's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · 6fe5468f
      John W. Linville authored
      Conflicts:
      	drivers/net/wireless/rt2x00/rt2x00pci.c
      6fe5468f
  3. 09 Apr, 2013 18 commits