Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 26 Jun 2013 16:01:42 +0000 (12:01 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 26 Jun 2013 16:01:42 +0000 (12:01 -0400)
1  2 
drivers/net/wireless/ath/ath9k/htc_drv_main.c
drivers/net/wireless/ath/ath9k/xmit.c
net/bluetooth/l2cap_core.c

Simple merge
Simple merge