Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Wed, 26 Apr 2006 10:16:50 +0000 (06:16 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 26 Apr 2006 10:16:50 +0000 (06:16 -0400)
commit3b908870b8332dfd40be0e919e187aa4991536fb
treecb7cc30d04e647902b8c6cfac840626a4d09e770
parent3b85418bc998876ce46784fb49f243100b2dd909
parent7c241d37fe0e6442c5cf3b5d73f7f58f2dc66352
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes