Merge branch 'no-ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 Aug 2008 08:28:35 +0000 (01:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Aug 2008 08:28:35 +0000 (01:28 -0700)
commit33e334950abda8e42c3b6e6f280fad0d4ab92141
tree7d52e5d4772f578c499200f38cfc54b79e3357fb
parentad619800e4e034cad44299b2a22df9eebb043ac3
parent3e2236c108792c3afbbfbe3f373ee7fdd68eda8e
Merge branch 'no-ath9k' of git://git./linux/kernel/git/linville/wireless-2.6