Merge branch 'no-iwlwifi' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Wed, 27 Aug 2008 11:29:50 +0000 (04:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Aug 2008 11:29:50 +0000 (04:29 -0700)
commit6c36810a731a422535d838cdb440f332c1d91017
treeec8c129bbd7b1277cb947621a930ef7dce03d943
parentdf69471290cbec7714f6d1fabd14f4e41219cee1
parent576fdeaef631976c3afcb1d78ef196051282611d
Merge branch 'no-iwlwifi' of git://git./linux/kernel/git/linville/wireless-2.6