]> err.no Git - linux-2.6/commitdiff
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)

Trivial merge