Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
commit78eb77a9cc3af73e3cd86a197b7c1f28fd840978
authorJeff Garzik <jeff@garzik.org>
Mon, 6 Nov 2006 07:58:09 +0000 (6 02:58 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 6 Nov 2006 07:58:09 +0000 (6 02:58 -0500)
tree2cf5fb9935412e1a0fae2b25718aa84fc2e8412d
parenta81c52a81d6dbe6a36bce18112da04f20b175192
parentdf6d7c94b0c3ae6a1185c9e5fa8ee3368e4a5efb
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes