Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Thu, 30 Nov 2006 11:01:04 +0000 (06:01 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 30 Nov 2006 11:01:04 +0000 (06:01 -0500)
commitc1cb0b77f905a2f5f297e91fafbe766acc143891
tree64fdce32842a8fd0d0765745df7aaf207e34b07f
parentf2b67c7945e8d709444884633670fef498218639
parenta88556a4b24baff99f5d2a2a05202c4aca44ea05
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes