Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Fri, 17 Mar 2006 00:16:59 +0000 (19:16 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 17 Mar 2006 00:16:59 +0000 (19:16 -0500)
commitb27a1ed571e12e7ec75b8907bf02fd69fd2bfe10
treee5b305e07c559f92275cbd902bda70aeaeca7346
parentca68bb1e41c4937fc125d3917dd1feadc493d850
parent72df16f109b73be37977a26d342e9103e8851cb6
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6