Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Fri, 4 Mar 2011 20:48:25 +0000 (12:48 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 4 Mar 2011 20:48:25 +0000 (12:48 -0800)
commitd72751ede1b9bf993d7bd3377305c8e9e36a3cc4
tree27abaa49de7ff666dbf6bbcb0d7bae2b9f029a2d
parent0a0e9ae1bd788bc19adc4d4ae08c98b233697402
parent85a7045a90052749885e166f40af5e9140032287
Merge branch 'for-davem' of ssh:///linux/kernel/git/linville/wireless-next-2.6
drivers/net/wireless/ath/ath9k/hif_usb.c
drivers/net/wireless/iwlwifi/iwl-5000.c