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)
commit98b7ff9a4977e4f4f451c30288b197ad79e5ab7f
treeb0aae5739f08a2c3fd822e2b86dd1a369fd2e0a2
parent32fcafbcd1c9f6c7013016a22a5369b4acb93577
parent466026989f112e0546ca39ab00a759af82dbe83a
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
drivers/bcma/driver_pci_host.c
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
drivers/net/wireless/ath/ath9k/hw.c