Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Wed, 26 Apr 2006 10:18:15 +0000 (06:18 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 26 Apr 2006 10:18:15 +0000 (06:18 -0400)
commit00355cd938bac2a6006efa140352958784431f1f
tree4f8bd8f9117a5ea180da97fd889b5305738b3be2
parent45de6fd958d7f407bdb5fdc6914b3262519d891c
parent3c304956755fa63ee80ca51ce38078fe1c4e8818
Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream