Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Jun 2011 21:21:00 +0000 (14:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Jun 2011 21:21:00 +0000 (14:21 -0700)
commitcd5f3e2064ea21e1cbe140728a1b04e7d32f68eb
treec2d924b975bdf6fd294546ffb800116c508878e7
parent95cb3656c09fcf6577138337216c27744ebc91e2
parent36099365c7cc64e5184b66b6eb094950a13f540c
Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless-next-2.6
drivers/net/wireless/rtlwifi/wifi.h