Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJeff Garzik <jeff@garzik.org>
Tue, 20 Feb 2007 16:28:42 +0000 (11:28 -0500)
committerJeff Garzik <jeff@garzik.org>
Tue, 20 Feb 2007 16:28:42 +0000 (11:28 -0500)
commit6606e17a7f1c3bc1b1e83d0c517f11d094e55bf1
tree83f20d0d3c12d9db75fdfc74454d781d2e4ea590
parent6aab44475a1355365f0a24abe6f8eb32185a701e
parentb312362be6d9155b66f3a26d9159e0a680fbd6c5
Merge branch 'upstream-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream