Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Fri, 10 Nov 2006 16:10:51 +0000 (11:10 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 10 Nov 2006 16:10:51 +0000 (11:10 -0500)
commit1f10bec3ef9d9d97999c72e19625432836820221
treed5f13c57c93a4cf1f42b83aa14351dfdea622d1e
parent92b1f905637bbd79fcd430a09737fd97061eb405
parent3406118cd34762a7bf6b1a4f1095f9ea7576a354
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes