Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jgarzik@pobox.com>
Tue, 31 Jan 2006 16:50:11 +0000 (11:50 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 31 Jan 2006 16:50:11 +0000 (11:50 -0500)
commit0febb720fe77153f54b68fe7a3d7114f4c6711d8
treed0d99f78b46051cabd1e75ce5269b6d1a40f7a12
parentb0b020d4783fbc4cc477e2ca678ac47c50d5bc3e
parentae7ec20582de0867abda66ad06d468ce12b231f2
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6