Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Tue, 12 Sep 2006 15:42:33 +0000 (11:42 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 12 Sep 2006 15:42:33 +0000 (11:42 -0400)
commit1802ca745280b916cda4090e459741b8c9b3e8d0
treeeda781119a372cb05da7ba9dbbc44502ad222a01
parent05ff0e291af086f4325bac76abad250690bbbd63
parentdb888aed7e83559d61cff04bf002d0fb80ecbfa7
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes