Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Tue, 20 Jun 2006 08:46:02 +0000 (04:46 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 20 Jun 2006 08:46:02 +0000 (04:46 -0400)
commit4b2d9cf00962d0a0e697f887f3ecaa155cbde555
tree3a64ad0825e82c3df0b4d84c412c647c19e34afb
parent4c1234ff24dd8dc2d9020d6315d91a71339be114
parent89c318ed3985da1271e00ad586f2dce8a6e75656
Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream