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)

Trivial merge