Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Jul 2010 19:31:51 +0000 (15:31 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Jul 2010 19:31:51 +0000 (15:31 -0400)
commit815868e7b5c207ba42d5b317ccc51f8112732268
treec0531faf1c8925ba36fc2cb6e9ac17b1ce0f35d5
parent084cb0fe773dc3dbe2bb08039dbd0e9e93d103ce
parentf8036965ccec4d786d8bf09bf57b793542cb3dce
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/ath/ath9k/hif_usb.c
drivers/net/wireless/iwlwifi/iwl-sta.h