Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Thu, 20 Apr 2006 21:36:10 +0000 (17:36 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 20 Apr 2006 21:36:10 +0000 (17:36 -0400)
commitf18b95c3e2ab0f75b23a5aabab0bc8f99bd6bbf3
tree9ff4b7efdb2ca1e83c2a413f06268b268098b3ca
parent17c281ab3e33be63693687d3db7ac9cf2bbdfd66
parent848ef8555296f25d9226d3bc43ce4028835ed633
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6