Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 15 Oct 2008 06:19:16 +0000 (23:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Oct 2008 06:19:16 +0000 (23:19 -0700)
commitab55570d64d5409fa940e85dd8de2594b160f826
tree4010f080f2631e046ee4b5dcb29c8df2cfb9ee7e
parenteef9d90dcde7bb4d029b67ed36457efc4970d5a2
parent8713a7ccd88d93d9f8a72436088d6627c82490db
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6