Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 Mar 2011 01:55:20 +0000 (18:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Mar 2011 01:55:20 +0000 (18:55 -0700)
commit4a37390de98547e42ad0cb617bd2f2d452f2d4c7
treedb85234eb9e636f27a6571ba1e454d736130b829
parent4a2b9c3756077c05dd8666e458a751d2248b61b6
parentfea41cc9b1af5f65fecf4013ad62284e6ae3a78c
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/iwlwifi/iwl-1000.c