Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 1 Mar 2013 18:52:03 +0000 (13:52 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 1 Mar 2013 18:52:03 +0000 (13:52 -0500)
1  2 
drivers/bcma/driver_pci_host.c
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
drivers/net/wireless/ath/ath9k/hw.c

Simple merge
Simple merge