Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jgarzik@pobox.com>
Sat, 28 Jan 2006 21:07:32 +0000 (16:07 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 28 Jan 2006 21:07:32 +0000 (16:07 -0500)
commit4f975b32433df87b8ead3de9944e0a9f90d261fd
tree85fc678ccca9eac622b9513919812d2602ea4da1
parent0cc349d130b34de3046fb3d0e31eaf6ff5540cad
parentd1b46b0fba8c1049135ee5d60910b04463dccc95
Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6