Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Wed, 19 Jul 2006 17:51:27 +0000 (13:51 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 19 Jul 2006 17:51:27 +0000 (13:51 -0400)
commit225ec70a8cf5086a70d755e394c56186a30053d3
tree0143bb4f394c617822479e1c36a4b3bb3b07e14c
parent3fac0613937dff488141c8ade3320fd815c38ed7
parentdd2f5538a157bda68bfa8efb39feaaccdda9e74e
Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream