The following commit has been merged in the batman-adv/next branch: commit 2ea214929d601a9308e47c3d380e50315963ce42 Merge: 1b3a6926fc3430116c97c333f7cf901b86779008 16698918cdb39ae0d9289741ac2a9ed179f8b8ba Author: David S. Miller davem@davemloft.net Date: Wed Aug 15 15:26:05 2012 -0700
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
==================== This is a batch of updates intended for 3.7. The ath9k, mwifiex, and b43 drivers get the bulk of the commits this time, with a handful of other driver bits thrown-in. It is mostly just minor fixes and cleanups, etc.
Also included is a Bluetooth pull, with a lot of refactoring. Gustavo says:
"These are the changes I queued for 3.7. There are a many small fixes/improvements by Andre Guedes. A l2cap channel refcounting refactor by Jaganath. Bluetooth sockets now appears in /proc/net, by Masatake Yamato and Sachin Kamat changes ours drivers to use devm_kzalloc()." ====================
Signed-off-by: David S. Miller davem@davemloft.net