Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Fri, 14 Sep 2012 17:53:49 +0000 (13:53 -0400)]
1  2 
drivers/net/wireless/airo.c
include/net/cfg80211.h
net/bluetooth/l2cap_sock.c
net/wireless/nl80211.c

Simple merge
Simple merge
Simple merge
Simple merge