Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
commit2b14c30b46e007a16c665cc86329bf4a1d9ff6ee
authorJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:19:44 +0000 (3 17:19 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:19:44 +0000 (3 17:19 -0400)
tree2d882d7b9b8a9b4efdef8cb782fd8c13c8df5620
parentfd60ae404f104f12369e654af9cf03b1f1047661
parentfde627b54ce7bef094157074f3adb9b6e1a96d4c
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes