Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:41:25 +0000 (00:41 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:41:25 +0000 (00:41 -0400)
commit357eb4cf75fdb9dbe46b64d50f3670de6a45dc91
tree0ba358be2a3a9a62f722838adea7fff8a1f946ff
parentc5ab964debe92d0ec7af330f350a3433c1b5b61e
parent9b5cce07648d059a013444116bd0140b047b25a1
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes