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)
commit729d8d182bbf296b32cb2e7f970801eb6ce33c6a
tree9c44494da905a87373c1a1e16a1eb7db8d119cee
parent9fbdc75116f7a2b183464d42f3abccb616584105
parent57bf74407bd501b0599568a3112fc16395b575d9
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
drivers/net/wireless/ath/ath9k/htc_drv_main.c
drivers/net/wireless/ath/ath9k/xmit.c
net/bluetooth/l2cap_core.c