Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJeff Garzik <jeff@garzik.org>
Wed, 18 Jul 2007 22:31:03 +0000 (18:31 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 18 Jul 2007 22:31:03 +0000 (18:31 -0400)
commit5e1751f8396544df3b334afd2e67557757d47fb0
tree49a5caca5e5432822913b777cfda30ebda1aac0d
parentdbf812d6ae6da1bfd01ea6abc5af60b358e4f9ba
parent25343469e77bd6f5694bb6b641a8ea1bd2173782
Merge branch 'upstream-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream