Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:46:27 +0000 (15:46 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:46:27 +0000 (15:46 -0400)
commit2e84abe742c42f7b063b141db55e5793ce4c502c
tree38ce19eb451b969389e456aa4d9bb7321626f481
parent1def630a6a49dda5bc89dfbd86656293640456f0
parentea9a7719597e81a119a155178eabfc941eef11cc
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes