Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
commit7d450e00711bf8c72fc781677f7abc08d227578e
authorJeff Garzik <jeff@garzik.org>
Wed, 12 Jul 2006 21:40:45 +0000 (12 17:40 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 12 Jul 2006 21:40:45 +0000 (12 17:40 -0400)
treeb6a0b786dfac9ff7f2dd30cc867dbbd7a2482b98
parent95d161cbab9d4da8b3c2d179ae11825e1294989e
parentb312d799b324e895745ffe148def234fc60d5b74
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes