Merge branch 'ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirele...
authorDavid S. Miller <davem@davemloft.net>
Fri, 8 Aug 2008 01:52:57 +0000 (18:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Aug 2008 01:52:57 +0000 (18:52 -0700)

Trivial merge