Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJeff Garzik <jeff@garzik.org>
Mon, 16 Jul 2007 21:59:03 +0000 (17:59 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 16 Jul 2007 21:59:03 +0000 (17:59 -0400)
commit5be808467347fc99bdd216883c5dbd123d6ad9d6
tree7fe3f1ee051d261bb3739c5f9f1bb8489a0d6f71
parent8910b49fbb8d4517a20bb3de7dc239dcfa7d2b6f
parent4cf92a3cd9117cb90ad9441172b9f42b67ee9d26
Merge branch 'upstream-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream